DOMUI Prefs: Split search engines into two lists

chrome/browser/dom_ui/options/search_engine_manager_handler.cc

 // Copyright (c) 2011 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/dom_ui/options/search_engine_manager_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 32 matching lines @@
     OnModelChanged();
   }
 }
 
 void SearchEngineManagerHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   localized_strings->SetString("searchEngineManagerPage",
       l10n_util::GetStringUTF16(IDS_SEARCH_ENGINES_EDITOR_WINDOW_TITLE));
+  localized_strings->SetString("defaultSearchEngineListTitle",
+      l10n_util::GetStringUTF16(IDS_SEARCH_ENGINES_EDITOR_MAIN_SEPARATOR));
+  localized_strings->SetString("otherSearchEngineListTitle",
+      l10n_util::GetStringUTF16(IDS_SEARCH_ENGINES_EDITOR_OTHER_SEPARATOR));
   localized_strings->SetString("searchEngineTableNameHeader",
       l10n_util::GetStringUTF16(IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_COLUMN));
   localized_strings->SetString("searchEngineTableKeywordHeader",
       l10n_util::GetStringUTF16(IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN));
   localized_strings->SetString("searchEngineTableURLHeader",
       l10n_util::GetStringUTF16(IDS_SEARCH_ENGINES_EDITOR_EDIT_BUTTON));
   localized_strings->SetString("makeDefaultSearchEngineButton",
       l10n_util::GetStringUTF16(IDS_SEARCH_ENGINES_EDITOR_MAKE_DEFAULT_BUTTON));
   localized_strings->SetString("searchEngineTableNamePlaceholder",
       l10n_util::GetStringUTF16(IDS_SEARCH_ENGINE_ADD_NEW_NAME_PLACEHOLDER));
@@ skipping 28 matching lines @@
       NewCallback(this, &SearchEngineManagerHandler::EditCancelled));
   dom_ui_->RegisterMessageCallback(
       "searchEngineEditCompleted",
       NewCallback(this, &SearchEngineManagerHandler::EditCompleted));
 }
 
 void SearchEngineManagerHandler::OnModelChanged() {
   if (!list_controller_->loaded())
     return;
 
-  ListValue engine_list;
-
   // Find the default engine.
   const TemplateURL* default_engine =
       list_controller_->url_model()->GetDefaultSearchProvider();
   int default_index = list_controller_->table_model()->IndexOfTemplateURL(
       default_engine);
 
-  // Add the first group (default search engine options).
-  engine_list.Append(CreateDictionaryForHeading(0));
+  // Build the first list (default search engine options).
+  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) {
-    engine_list.Append(CreateDictionaryForEngine(i, i == default_index));
+    defaults_list.Append(CreateDictionaryForEngine(i, i == default_index));
   }
 
-  // Add the second group (other search templates).
-  engine_list.Append(CreateDictionaryForHeading(1));
+  // Build the second list (other search templates).
+  ListValue others_list;
   if (last_default_engine_index < 0)
     last_default_engine_index = 0;
   int engine_count = list_controller_->table_model()->RowCount();
   for (int i = last_default_engine_index; i < engine_count; ++i) {
-    engine_list.Append(CreateDictionaryForEngine(i, i == default_index));
+    others_list.Append(CreateDictionaryForEngine(i, i == default_index));
   }
 
   dom_ui_->CallJavascriptFunction(L"SearchEngineManager.updateSearchEngineList",
-                                  engine_list);
+                                  defaults_list, others_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();
 }
 
-DictionaryValue* SearchEngineManagerHandler::CreateDictionaryForHeading(
-    int group_index) {
-  ui::TableModel::Groups groups = list_controller_->table_model()->GetGroups();
-
-  DictionaryValue* dict = new DictionaryValue();
-  dict->SetString("heading", groups[group_index].title);
-  return dict;
-}
-
 DictionaryValue* SearchEngineManagerHandler::CreateDictionaryForEngine(
     int index, bool is_default) {
   TemplateURLTableModel* table_model = list_controller_->table_model();
 
   DictionaryValue* dict = new DictionaryValue();
   dict->SetString("name", table_model->GetText(
     index, IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_COLUMN));
   dict->SetString("keyword", table_model->GetText(
     index, IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN));
   const TemplateURL* template_url = list_controller_->GetTemplateURL(index);
@@ skipping 109 matching lines @@
   string16 keyword;
   std::string url;
   if (!args->GetString(ENGINE_NAME, &name) ||
       !args->GetString(ENGINE_KEYWORD, &keyword) ||
       !args->GetString(ENGINE_URL, &url)) {
     NOTREACHED();
     return;
   }
   edit_controller_->AcceptAddOrEdit(name, keyword, url);
 }