diff options
author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-27 18:14:29 +0000 |
---|---|---|
committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-27 18:14:29 +0000 |
commit | bfb19b64630633eef3dd8fea3bb88bfb02485b67 (patch) | |
tree | 52fd03690ead6a92f25fb711d7750141cb767704 /chrome/browser | |
parent | b9b99f6c2993e9447a0b79e06b943d7febd587a9 (diff) | |
download | chromium_src-bfb19b64630633eef3dd8fea3bb88bfb02485b67.zip chromium_src-bfb19b64630633eef3dd8fea3bb88bfb02485b67.tar.gz chromium_src-bfb19b64630633eef3dd8fea3bb88bfb02485b67.tar.bz2 |
DOMUI prefs: Add stub sub-page for search engine management
BUG=49091
TEST='Manage' button in DOMUI Basics prefs should bring up an empty sub-page.
Review URL: http://codereview.chromium.org/2806081
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53807 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
8 files changed, 103 insertions, 8 deletions
diff --git a/chrome/browser/dom_ui/options_ui.cc b/chrome/browser/dom_ui/options_ui.cc index 4d94072..1c8a4c7 100644 --- a/chrome/browser/dom_ui/options_ui.cc +++ b/chrome/browser/dom_ui/options_ui.cc @@ -24,6 +24,7 @@ #include "chrome/browser/dom_ui/core_options_handler.h" #include "chrome/browser/dom_ui/font_settings_handler.h" #include "chrome/browser/dom_ui/personal_options_handler.h" +#include "chrome/browser/dom_ui/search_engine_manager_handler.h" #include "chrome/browser/dom_ui/sync_options_handler.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/pref_service.h" @@ -126,6 +127,7 @@ OptionsUI::OptionsUI(TabContents* contents) : DOMUI(contents) { AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler()); AddOptionsPageUIHandler(localized_strings, new FontSettingsHandler()); AddOptionsPageUIHandler(localized_strings, new PersonalOptionsHandler()); + AddOptionsPageUIHandler(localized_strings, new SearchEngineManagerHandler()); AddOptionsPageUIHandler(localized_strings, new SyncOptionsHandler()); #if defined(OS_CHROMEOS) AddOptionsPageUIHandler(localized_strings, diff --git a/chrome/browser/dom_ui/search_engine_manager_handler.cc b/chrome/browser/dom_ui/search_engine_manager_handler.cc new file mode 100644 index 0000000..518500c --- /dev/null +++ b/chrome/browser/dom_ui/search_engine_manager_handler.cc @@ -0,0 +1,30 @@ +// Copyright (c) 2010 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/search_engine_manager_handler.h" + +#include "app/l10n_util.h" +#include "base/callback.h" +#include "base/values.h" +#include "chrome/browser/profile.h" +#include "chrome/common/url_constants.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" + +SearchEngineManagerHandler::SearchEngineManagerHandler() { +} + +SearchEngineManagerHandler::~SearchEngineManagerHandler() { +} + +void SearchEngineManagerHandler::GetLocalizedValues( + DictionaryValue* localized_strings) { + DCHECK(localized_strings); + + localized_strings->SetString(L"searchEngineManagerPage", + l10n_util::GetString(IDS_SEARCH_ENGINES_EDITOR_WINDOW_TITLE)); +} + +void SearchEngineManagerHandler::RegisterMessages() { +} diff --git a/chrome/browser/dom_ui/search_engine_manager_handler.h b/chrome/browser/dom_ui/search_engine_manager_handler.h new file mode 100644 index 0000000..371554a --- /dev/null +++ b/chrome/browser/dom_ui/search_engine_manager_handler.h @@ -0,0 +1,24 @@ +// Copyright (c) 2010 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. + +#ifndef CHROME_BROWSER_DOM_UI_SEARCH_ENGINE_MANAGER_HANDLER_H_ +#define CHROME_BROWSER_DOM_UI_SEARCH_ENGINE_MANAGER_HANDLER_H_ + +#include "chrome/browser/dom_ui/options_ui.h" + +class SearchEngineManagerHandler : public OptionsPageUIHandler { + public: + SearchEngineManagerHandler(); + virtual ~SearchEngineManagerHandler(); + + // OptionsUIHandler implementation. + virtual void GetLocalizedValues(DictionaryValue* localized_strings); + + virtual void RegisterMessages(); + + private: + DISALLOW_COPY_AND_ASSIGN(SearchEngineManagerHandler); +}; + +#endif // CHROME_BROWSER_DOM_UI_SEARCH_ENGINE_MANAGER_HANDLER_H_ diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html index 66370bf..45c90f2 100644 --- a/chrome/browser/resources/options.html +++ b/chrome/browser/resources/options.html @@ -28,15 +28,16 @@ <script src="options/chromeos_accounts_user_list.js"></script> <script src="options/chromeos_accounts_add_user_overlay.js"></script> </if> +<script src="options/add_startup_page_overlay.js"></script> <script src="options/advanced_options.js"></script> <script src="options/browser_options.js"></script> -<script src="options/personal_options.js"></script> +<script src="options/clear_browser_data_overlay.js"></script> +<script src="options/content_settings.js"></script> <script src="options/content_settings_exceptions_list.js"></script> <script src="options/content_settings_ui.js"></script> -<script src="options/content_settings.js"></script> -<script src="options/add_startup_page_overlay.js"></script> -<script src="options/clear_browser_data_overlay.js"></script> <script src="options/font_settings_overlay.js"></script> +<script src="options/personal_options.js"></script> +<script src="options/search_engine_manager.js"></script> <script> /////////////////////////////////////////////////////////////////////////////// @@ -65,6 +66,7 @@ function load() { OptionsPage.register(PersonalOptions.getInstance()); OptionsPage.register(AdvancedOptions.getInstance()); OptionsPage.registerSubPage(ContentSettings.getInstance()); + OptionsPage.registerSubPage(SearchEngineManager.getInstance()); OptionsPage.registerOverlay(AddStartupPageOverlay.getInstance()); OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance()); OptionsPage.registerOverlay(FontSettingsOverlay.getInstance()); @@ -147,11 +149,12 @@ window.onpopstate = function(e) { - options/chromeos_language_pinyin_options.html --> </if> + <include src="options/advanced_options.html"> <include src="options/browser_options.html"> + <include src="options/content_settings.html"> <include src="options/personal_options.html"> + <include src="options/search_engine_manager.html"> <include src="options/sync_options.html"> - <include src="options/advanced_options.html"> - <include src="options/content_settings.html"> </div> </div> diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html index 38b434f..abeb46e 100644 --- a/chrome/browser/resources/options/browser_options.html +++ b/chrome/browser/resources/options/browser_options.html @@ -49,7 +49,7 @@ <select id="defaultSearchEngine" onchange="BrowserOptions.getInstance().setDefaultBrowser()"> </select> - <button id="defaultSearchManageEnginesButton" disabled + <button id="defaultSearchManageEnginesButton" i18n-content="defaultSearchManageEnginesLink"></button> </div> </section> diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js index 9d9d412..834c993 100644 --- a/chrome/browser/resources/options/browser_options.js +++ b/chrome/browser/resources/options/browser_options.js @@ -34,7 +34,7 @@ BrowserOptions.prototype = { // TODO(stuartmorgan): Add all open tabs (except this one). }; $('defaultSearchManageEnginesButton').onclick = function(event) { - // TODO(stuartmorgan): Spawn search engine management sub-dialog. + OptionsPage.showPageByName('searchEngines'); }; $('defaultBrowserUseAsDefaultButton').onclick = function(event) { chrome.send('becomeDefaultBrowser'); diff --git a/chrome/browser/resources/options/search_engine_manager.html b/chrome/browser/resources/options/search_engine_manager.html new file mode 100644 index 0000000..1bcf35a --- /dev/null +++ b/chrome/browser/resources/options/search_engine_manager.html @@ -0,0 +1,7 @@ +<div class="page hidden" id="searchEngineManagerPage"> + <h1> + <span i18n-content="browserPage"></span> + > + <span i18n-content="searchEngineManagerPage"></span> + </h1> +</div> diff --git a/chrome/browser/resources/options/search_engine_manager.js b/chrome/browser/resources/options/search_engine_manager.js new file mode 100644 index 0000000..c1bdd76 --- /dev/null +++ b/chrome/browser/resources/options/search_engine_manager.js @@ -0,0 +1,29 @@ +// Copyright (c) 2010 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. + +/////////////////////////////////////////////////////////////////////////////// +// SearchEngineManager class: + +/** + * Encapsulated handling of search engine management page. + * @constructor + */ +function SearchEngineManager() { + this.activeNavTab = null; + OptionsPage.call(this, 'searchEngines', + templateData.searchEngineManagerPage, + 'searchEngineManagerPage'); +} + +cr.addSingletonGetter(SearchEngineManager); + +SearchEngineManager.prototype = { + __proto__: OptionsPage.prototype, + + initializePage: function() { + OptionsPage.prototype.initializePage.call(this); + + // TODO(stuartmorgan): Add initialization here. + }, +}; |