Don't persist and sync omnibox extension keywords.

chrome/browser/ui/webui/options/search_engine_manager_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/search_engine_manager_handler.h"
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 111 matching lines @@
   int default_index = list_controller_->table_model()->IndexOfTemplateURL(
       default_engine);
 
   // Build the first list (default search engine options).
   base::ListValue defaults_list;
   int last_default_engine_index =
       list_controller_->table_model()->last_search_engine_index();
   for (int i = 0; i < last_default_engine_index; ++i) {
     // Third argument is false, as the engine is not from an extension.
     defaults_list.Append(CreateDictionaryForEngine(
-        i, i == default_index, false));
+        i, i == default_index));
   }
 
   // Build the second list (other search templates).
   base::ListValue others_list;
   int last_other_engine_index =
       list_controller_->table_model()->last_other_engine_index();
   if (last_default_engine_index < 0)
     last_default_engine_index = 0;
   for (int i = last_default_engine_index; i < last_other_engine_index; ++i) {
-    others_list.Append(CreateDictionaryForEngine(i, i == default_index, false));
+    others_list.Append(CreateDictionaryForEngine(i, i == default_index));
   }
 
   // Build the extension keywords list.
   base::ListValue keyword_list;
   if (last_other_engine_index < 0)
     last_other_engine_index = 0;
   int engine_count = list_controller_->table_model()->RowCount();
   for (int i = last_other_engine_index; i < engine_count; ++i) {
-    keyword_list.Append(CreateDictionaryForEngine(i, i == default_index, true));
+    keyword_list.Append(CreateDictionaryForEngine(i, i == default_index));
   }
 
   web_ui()->CallJavascriptFunction("SearchEngineManager.updateSearchEngineList",
                                    defaults_list, others_list, keyword_list);
 }
 
 void SearchEngineManagerHandler::OnItemsChanged(int start, int length) {
   OnModelChanged();
 }
 
 void SearchEngineManagerHandler::OnItemsAdded(int start, int length) {
   OnModelChanged();
 }
 
 void SearchEngineManagerHandler::OnItemsRemoved(int start, int length) {
   OnModelChanged();
 }
 
 base::DictionaryValue* SearchEngineManagerHandler::CreateDictionaryForEngine(
-    int index, bool is_default, bool is_extension) {
+    int index, bool is_default) {
   TemplateURLTableModel* table_model = list_controller_->table_model();
   const TemplateURL* template_url = list_controller_->GetTemplateURL(index);
 
   // The items which are to be written into |dict| are also described in
   // chrome/browser/resources/options/search_engine_manager_engine_list.js
   // in @typedef for SearchEngine. Please update it whenever you add or remove
   // any keys here.
   base::DictionaryValue* dict = new base::DictionaryValue();
   dict->SetString("name",  template_url->short_name());
   dict->SetString("displayName", table_model->GetText(
     index, IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_COLUMN));
   dict->SetString("keyword", table_model->GetText(
     index, IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN));
   dict->SetString("url", template_url->url_ref().DisplayURL(
       UIThreadSearchTermsData(Profile::FromWebUI(web_ui()))));
   dict->SetBoolean("urlLocked", template_url->prepopulate_id() > 0);
   GURL icon_url = template_url->favicon_url();
   if (icon_url.is_valid())
     dict->SetString("iconURL", icon_url.spec());
   dict->SetString("modelIndex", base::IntToString(index));
 
   dict->SetBoolean("canBeRemoved",
-      list_controller_->CanRemove(template_url) && !is_extension);
+                   list_controller_->CanRemove(template_url));
   dict->SetBoolean("canBeDefault",
-      list_controller_->CanMakeDefault(template_url) && !is_extension);
+                   list_controller_->CanMakeDefault(template_url));
   dict->SetBoolean("default", is_default);
   dict->SetBoolean("canBeEdited", list_controller_->CanEdit(template_url));
-  dict->SetBoolean("isExtension", is_extension);
-  if (template_url->GetType() == TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION) {
+  TemplateURL::Type type = template_url->GetType();
+  dict->SetBoolean("isOmniboxExtension",
+                   type == TemplateURL::OMNIBOX_API_EXTENSION);
+  if (type == TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION ||
+      type == TemplateURL::OMNIBOX_API_EXTENSION) {
     const extensions::Extension* extension =
         extensions::ExtensionRegistry::Get(Profile::FromWebUI(web_ui()))
             ->GetExtensionById(template_url->GetExtensionId(),
                                extensions::ExtensionRegistry::EVERYTHING);
     if (extension) {
       dict->Set("extension",
                 extensions::util::GetExtensionInfo(extension).release());
     }
   }
   return dict;
@@ skipping 108 matching lines @@
 
   // Recheck validity.  It's possible to get here with invalid input if e.g. the
   // user calls the right JS functions directly from the web inspector.
   if (edit_controller_->IsTitleValid(name) &&
       edit_controller_->IsKeywordValid(keyword) &&
       edit_controller_->IsURLValid(url))
     edit_controller_->AcceptAddOrEdit(name, keyword, url);
 }
 
 }  // namespace options