summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-05 17:48:34 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-05 17:48:34 +0000
commit1cd00632d12a7d98bfc65a4262c5659cda51caa2 (patch)
treeecdf889e6c48d0a0c2859a15f24d287f588250aa
parentd6149fded8c3cc8939e244ae6c5d9d076e69a4ab (diff)
downloadchromium_src-1cd00632d12a7d98bfc65a4262c5659cda51caa2.zip
chromium_src-1cd00632d12a7d98bfc65a4262c5659cda51caa2.tar.gz
chromium_src-1cd00632d12a7d98bfc65a4262c5659cda51caa2.tar.bz2
DOMUI: Base framework for the AutoFill page.
BUG=49094 TEST=none Review URL: http://codereview.chromium.org/3044047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55093 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/dom_ui/autofill_options_handler.cc27
-rw-r--r--chrome/browser/dom_ui/autofill_options_handler.h24
-rw-r--r--chrome/browser/dom_ui/options_ui.cc4
-rw-r--r--chrome/browser/resources/options.html4
-rw-r--r--chrome/browser/resources/options/autofill_options.html7
-rw-r--r--chrome/browser/resources/options/autofill_options.js41
-rw-r--r--chrome/browser/resources/options/personal_options.js2
-rw-r--r--chrome/chrome_browser.gypi2
8 files changed, 109 insertions, 2 deletions
diff --git a/chrome/browser/dom_ui/autofill_options_handler.cc b/chrome/browser/dom_ui/autofill_options_handler.cc
new file mode 100644
index 0000000..441a2aa
--- /dev/null
+++ b/chrome/browser/dom_ui/autofill_options_handler.cc
@@ -0,0 +1,27 @@
+// 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/autofill_options_handler.h"
+
+#include "app/l10n_util.h"
+#include "base/logging.h"
+#include "base/values.h"
+#include "grit/generated_resources.h"
+
+AutoFillOptionsHandler::AutoFillOptionsHandler() {
+}
+
+AutoFillOptionsHandler::~AutoFillOptionsHandler() {
+}
+
+void AutoFillOptionsHandler::GetLocalizedValues(
+ DictionaryValue* localized_strings) {
+ DCHECK(localized_strings);
+
+ localized_strings->SetString(L"autoFillOptionsTitle",
+ l10n_util::GetString(IDS_AUTOFILL_OPTIONS_TITLE));
+}
+
+void AutoFillOptionsHandler::RegisterMessages() {
+}
diff --git a/chrome/browser/dom_ui/autofill_options_handler.h b/chrome/browser/dom_ui/autofill_options_handler.h
new file mode 100644
index 0000000..7af92f8
--- /dev/null
+++ b/chrome/browser/dom_ui/autofill_options_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_AUTOFILL_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_DOM_UI_AUTOFILL_OPTIONS_HANDLER_H_
+
+#include "chrome/browser/dom_ui/options_ui.h"
+
+class AutoFillOptionsHandler : public OptionsPageUIHandler {
+ public:
+ AutoFillOptionsHandler();
+ virtual ~AutoFillOptionsHandler();
+
+ // OptionsUIHandler implementation.
+ virtual void GetLocalizedValues(DictionaryValue* localized_strings);
+
+ virtual void RegisterMessages();
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(AutoFillOptionsHandler);
+};
+
+#endif // CHROME_BROWSER_DOM_UI_AUTOFILL_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/dom_ui/options_ui.cc b/chrome/browser/dom_ui/options_ui.cc
index e726111..1c41088 100644
--- a/chrome/browser/dom_ui/options_ui.cc
+++ b/chrome/browser/dom_ui/options_ui.cc
@@ -19,10 +19,12 @@
#include "chrome/browser/chrome_thread.h"
#include "chrome/browser/dom_ui/add_startup_page_handler.h"
#include "chrome/browser/dom_ui/advanced_options_handler.h"
+#include "chrome/browser/dom_ui/autofill_options_handler.h"
#include "chrome/browser/dom_ui/browser_options_handler.h"
#include "chrome/browser/dom_ui/clear_browser_data_handler.h"
#include "chrome/browser/dom_ui/content_settings_handler.h"
#include "chrome/browser/dom_ui/core_options_handler.h"
+#include "chrome/browser/dom_ui/dom_ui_theme_source.h"
#include "chrome/browser/dom_ui/font_settings_handler.h"
#include "chrome/browser/dom_ui/import_data_handler.h"
#include "chrome/browser/dom_ui/passwords_exceptions_handler.h"
@@ -30,7 +32,6 @@
#include "chrome/browser/dom_ui/search_engine_manager_handler.h"
#include "chrome/browser/dom_ui/stop_syncing_handler.h"
#include "chrome/browser/dom_ui/sync_options_handler.h"
-#include "chrome/browser/dom_ui/dom_ui_theme_source.h"
#include "chrome/browser/metrics/user_metrics.h"
#include "chrome/browser/pref_service.h"
#include "chrome/browser/profile.h"
@@ -130,6 +131,7 @@ OptionsUI::OptionsUI(TabContents* contents) : DOMUI(contents) {
AddOptionsPageUIHandler(localized_strings, new AddStartupPageHandler());
AddOptionsPageUIHandler(localized_strings, new AdvancedOptionsHandler());
+ AddOptionsPageUIHandler(localized_strings, new AutoFillOptionsHandler());
AddOptionsPageUIHandler(localized_strings, new BrowserOptionsHandler());
AddOptionsPageUIHandler(localized_strings, new ClearBrowserDataHandler());
AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler());
diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html
index bf65369..e8e36c9 100644
--- a/chrome/browser/resources/options.html
+++ b/chrome/browser/resources/options.html
@@ -41,6 +41,7 @@
</if>
<script src="options/add_startup_page_overlay.js"></script>
<script src="options/advanced_options.js"></script>
+<script src="options/autofill_options.js"></script>
<script src="options/browser_options.js"></script>
<script src="options/clear_browser_data_overlay.js"></script>
<script src="options/content_settings.js"></script>
@@ -56,6 +57,7 @@
var AddStartupPageOverlay = options.AddStartupPageOverlay;
var AdvancedOptions = options.AdvancedOptions;
+var AutoFillOptions = options.AutoFillOptions;
var BrowserOptions = options.BrowserOptions;
var ClearBrowserDataOverlay = options.ClearBrowserDataOverlay;
var ContentSettings = options.ContentSettings;
@@ -99,6 +101,7 @@ function load() {
OptionsPage.register(BrowserOptions.getInstance());
OptionsPage.register(PersonalOptions.getInstance());
OptionsPage.register(AdvancedOptions.getInstance());
+ OptionsPage.registerSubPage(AutoFillOptions.getInstance());
OptionsPage.registerSubPage(ContentSettings.getInstance());
OptionsPage.registerSubPage(PasswordsExceptions.getInstance());
OptionsPage.registerSubPage(SearchEngineManager.getInstance());
@@ -196,6 +199,7 @@ window.onpopstate = function(e) {
-->
</if>
<include src="options/advanced_options.html">
+ <include src="options/autofill_options.html">
<include src="options/browser_options.html">
<include src="options/content_settings.html">
<include src="options/passwords_exceptions.html">
diff --git a/chrome/browser/resources/options/autofill_options.html b/chrome/browser/resources/options/autofill_options.html
new file mode 100644
index 0000000..0bf82c9
--- /dev/null
+++ b/chrome/browser/resources/options/autofill_options.html
@@ -0,0 +1,7 @@
+<div class="page hidden" id="autoFillOptionsPage">
+ <h1>
+ <span i18n-content="personalPage"></span>
+ &gt;
+ <span i18n-content="autoFillOptionsTitle"></span>
+ </h1>
+</div>
diff --git a/chrome/browser/resources/options/autofill_options.js b/chrome/browser/resources/options/autofill_options.js
new file mode 100644
index 0000000..678a1ac
--- /dev/null
+++ b/chrome/browser/resources/options/autofill_options.js
@@ -0,0 +1,41 @@
+// 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.
+
+cr.define('options', function() {
+
+ var OptionsPage = options.OptionsPage;
+
+ /////////////////////////////////////////////////////////////////////////////
+ // AutoFillOptions class:
+
+ /**
+ * Encapsulated handling of AutoFill options page.
+ * @constructor
+ */
+ function AutoFillOptions() {
+ this.activeNavTab = null;
+ OptionsPage.call(this, 'autoFillOptions',
+ templateData.autoFillOptionsTitle,
+ 'autoFillOptionsPage');
+ }
+
+ cr.addSingletonGetter(AutoFillOptions);
+
+ AutoFillOptions.prototype = {
+ __proto__: OptionsPage.prototype,
+
+ initializePage: function() {
+ OptionsPage.prototype.initializePage.call(this);
+
+ // TODO(jhawkins): Add initialization here.
+ }
+ };
+
+ // Export
+ return {
+ AutoFillOptions: AutoFillOptions
+ };
+
+});
+
diff --git a/chrome/browser/resources/options/personal_options.js b/chrome/browser/resources/options/personal_options.js
index 7318c02..33811bf 100644
--- a/chrome/browser/resources/options/personal_options.js
+++ b/chrome/browser/resources/options/personal_options.js
@@ -55,7 +55,7 @@ cr.define('options', function() {
};
$('autofill_options').onclick = function(event) {
- //TODO(sargrass): Show autofill dialog here.
+ OptionsPage.showPageByName('autoFillOptions');
};
$('import_data').onclick = function(event) {
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index bd949bc..a6d6afe 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1114,6 +1114,8 @@
'browser/dom_operation_notification_details.h',
'browser/dom_ui/app_launcher_handler.cc',
'browser/dom_ui/app_launcher_handler.h',
+ 'browser/dom_ui/autofill_options_handler.cc',
+ 'browser/dom_ui/autofill_options_handler.h',
'browser/dom_ui/bookmarks_ui.cc',
'browser/dom_ui/bookmarks_ui.h',
'browser/dom_ui/chrome_url_data_manager.cc',