diff options
| -rw-r--r-- | chrome/browser/template_url_prepopulate_data.cc | 28 | ||||
| -rw-r--r-- | chrome/browser/views/keyword_editor_view.cc | 5 |
2 files changed, 14 insertions, 19 deletions
diff --git a/chrome/browser/template_url_prepopulate_data.cc b/chrome/browser/template_url_prepopulate_data.cc index db63148..fd9f739 100644 --- a/chrome/browser/template_url_prepopulate_data.cc +++ b/chrome/browser/template_url_prepopulate_data.cc @@ -45,7 +45,7 @@ struct PrepopulatedEngine { // to appear for one country (e.g. Live Search U.S. English and Spanish), we // must use two different unique IDs (and different keywords). // - // The following unique IDs are available: 92, 93, 103+ + // The following unique IDs are available: 66, 93, 103+ // NOTE: CHANGE THE ABOVE NUMBERS IF YOU ADD A NEW ENGINE; ID conflicts = bad! const int id; }; @@ -469,6 +469,16 @@ const PrepopulatedEngine go = { 40, }; +const PrepopulatedEngine goo = { + L"goo", + L"goo.ne.jp", + L"http://goo.ne.jp/gooicon.ico", + L"http://search.goo.ne.jp/web.jsp?MT={searchTerms}&IE={inputEncoding}", + "UTF-8", + NULL, + 92, +}; + const PrepopulatedEngine google = { L"Google", NULL, @@ -522,16 +532,6 @@ const PrepopulatedEngine in = { 54, }; -const PrepopulatedEngine infoseek = { - L"Infoseek", - L"infoseek.co.jp", - L"http://search.www.infoseek.co.jp/favicon.ico", - L"http://search.www.infoseek.co.jp/Web?qt={searchTerms}&enc={inputEncoding}", - "EUC-JP", - NULL, - 66, -}; - const PrepopulatedEngine jabse = { L"Jabse", L"jabse.com", @@ -1603,7 +1603,7 @@ const PrepopulatedEngine t_online = { L"T-Online", L"suche.t-online.de", L"http://suche.t-online.de/favicon.ico", - L"http://suche.t-online.de/fast-cgi/tsc?q={searchTerms}", + L"http://suche.t-online.de/fast-cgi/tsc?sr=chrome&q={searchTerms}", "UTF-8", NULL, 49, @@ -2425,7 +2425,7 @@ const PrepopulatedEngine* engines_JO[] = // Japan const PrepopulatedEngine* engines_JP[] = - { &google, &yahoo_jp, &msn_ja_JP, &biglobe, &nifty, &infoseek, }; + { &google, &yahoo_jp, &msn_ja_JP, &biglobe, &goo, &nifty, }; // Kenya const PrepopulatedEngine* engines_KE[] = { &google, &yahoo, &msn, }; @@ -3006,7 +3006,7 @@ void RegisterUserPrefs(PrefService* prefs) { } int GetDataVersion() { - return 16; // Increment this if you change the above data in ways that mean + return 17; // Increment this if you change the above data in ways that mean // users with existing data should get a new version. } diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc index 0ee1ebb..1bd08a4 100644 --- a/chrome/browser/views/keyword_editor_view.cc +++ b/chrome/browser/views/keyword_editor_view.cc @@ -467,11 +467,6 @@ void KeywordEditorView::Init() { table_view_ = new views::TableView(table_model_.get(), columns, views::ICON_AND_TEXT, false, true, true); table_view_->SetObserver(this); - // Make the table initially sorted by name. - views::TableView::SortDescriptors sort; - sort.push_back(views::TableView::SortDescriptor( - IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_COLUMN, true)); - table_view_->SetSortDescriptors(sort); add_button_ = new views::NativeButton( l10n_util::GetString(IDS_SEARCH_ENGINES_EDITOR_NEW_BUTTON)); |