X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fui%2Fsearch_engines%2Fkeyword_editor_controller.cc;h=0087427c9c49ae75b5646ddcdb46c9ef8f1bcbc5;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=9d8b106d44cb87b59a8b7fc53d86b6431f3c0031;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/chrome/browser/ui/search_engines/keyword_editor_controller.cc b/src/chrome/browser/ui/search_engines/keyword_editor_controller.cc
index 9d8b106..0087427 100644
--- a/src/chrome/browser/ui/search_engines/keyword_editor_controller.cc
+++ b/src/chrome/browser/ui/search_engines/keyword_editor_controller.cc
@@ -8,7 +8,6 @@
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/search_engines/template_url_table_model.h"
-#include "chrome/common/pref_names.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
 #include "content/public/browser/user_metrics.h"
@@ -61,9 +60,9 @@ void KeywordEditorController::ModifyTemplateURL(TemplateURL* template_url,
 }
 
 bool KeywordEditorController::CanEdit(const TemplateURL* url) const {
-  return (url->GetType() != TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION) &&
-      (!url_model_->is_default_search_managed() ||
-       (url != url_model_->GetDefaultSearchProvider()));
+  return (url->GetType() == TemplateURL::NORMAL) &&
+      (url != url_model_->GetDefaultSearchProvider() ||
+       !url_model_->is_default_search_managed());
 }
 
 bool KeywordEditorController::CanMakeDefault(const TemplateURL* url) const {
@@ -71,7 +70,8 @@ bool KeywordEditorController::CanMakeDefault(const TemplateURL* url) const {
 }
 
 bool KeywordEditorController::CanRemove(const TemplateURL* url) const {
-  return url != url_model_->GetDefaultSearchProvider();
+  return (url->GetType() == TemplateURL::NORMAL) &&
+      (url != url_model_->GetDefaultSearchProvider());
 }
 
 void KeywordEditorController::RemoveTemplateURL(int index) {