summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-14 08:09:46 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-14 08:09:46 +0000
commitfec862637c99eff80e18a8769c0900f65d9d2d27 (patch)
tree6ad7389cc6dc946472f1293e759c15294950bb0c
parentaccd73eb441d113826ad10705ec6656a9b2e2b39 (diff)
downloadchromium_src-fec862637c99eff80e18a8769c0900f65d9d2d27.zip
chromium_src-fec862637c99eff80e18a8769c0900f65d9d2d27.tar.gz
chromium_src-fec862637c99eff80e18a8769c0900f65d9d2d27.tar.bz2
First cut at adding Chromium OS's "Languages and Input" options sub page.
This is more like a boilerplate place holder. Will add the contents in a separate change. BUG=chromiumo-os:4573 TEST=manually Review URL: http://codereview.chromium.org/2958003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52290 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/dom_ui/language_options_handler.cc45
-rw-r--r--chrome/browser/chromeos/dom_ui/language_options_handler.h25
-rw-r--r--chrome/browser/dom_ui/options_ui.cc2
-rw-r--r--chrome/browser/resources/options.html6
-rw-r--r--chrome/browser/resources/options/chromeos_language_options.html4
-rw-r--r--chrome/browser/resources/options/chromeos_system_options.js2
-rw-r--r--chrome/chrome_browser.gypi2
7 files changed, 85 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/dom_ui/language_options_handler.cc b/chrome/browser/chromeos/dom_ui/language_options_handler.cc
new file mode 100644
index 0000000..7c7da5e
--- /dev/null
+++ b/chrome/browser/chromeos/dom_ui/language_options_handler.cc
@@ -0,0 +1,45 @@
+// 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/chromeos/dom_ui/language_options_handler.h"
+
+#include "app/l10n_util.h"
+#include "app/resource_bundle.h"
+#include "base/values.h"
+#include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
+
+LanguageOptionsHandler::LanguageOptionsHandler() {
+}
+
+LanguageOptionsHandler::~LanguageOptionsHandler() {
+}
+
+void LanguageOptionsHandler::GetLocalizedValues(
+ DictionaryValue* localized_strings) {
+ DCHECK(localized_strings);
+ localized_strings->SetString(L"languagePage",
+ l10n_util::GetString(IDS_OPTIONS_SETTINGS_LANGUAGES_DIALOG_TITLE));
+ localized_strings->SetString(L"add_language",
+ l10n_util::GetString(
+ IDS_OPTIONS_SETTINGS_LANGUAGES_ADD_LANGUAGE_COMBOBOX));
+ localized_strings->SetString(L"configure",
+ l10n_util::GetString(IDS_OPTIONS_SETTINGS_LANGUAGES_CONFIGURE));
+ localized_strings->SetString(L"input_method",
+ l10n_util::GetString(IDS_OPTIONS_SETTINGS_LANGUAGES_INPUT_METHOD));
+ localized_strings->SetString(L"languages",
+ l10n_util::GetString(IDS_OPTIONS_SETTINGS_LANGUAGES_LANGUAGES));
+ localized_strings->SetString(L"remove_button",
+ l10n_util::GetString(IDS_OPTIONS_SETTINGS_LANGUAGES_REMOVE_BUTTON));
+ localized_strings->SetString(L"others",
+ l10n_util::GetString(IDS_OPTIONS_SETTINGS_LANGUAGES_OTHERS));
+ localized_strings->SetString(L"is_displayed_in_this_language",
+ l10n_util::GetStringF(
+ IDS_OPTIONS_SETTINGS_LANGUAGES_IS_DISPLAYED_IN_THIS_LANGUAGE,
+ l10n_util::GetString(IDS_PRODUCT_OS_NAME)));
+ localized_strings->SetString(L"display_in_this_language",
+ l10n_util::GetStringF(
+ IDS_OPTIONS_SETTINGS_LANGUAGES_DISPLAY_IN_THIS_LANGUAGE,
+ l10n_util::GetString(IDS_PRODUCT_OS_NAME)));
+}
diff --git a/chrome/browser/chromeos/dom_ui/language_options_handler.h b/chrome/browser/chromeos/dom_ui/language_options_handler.h
new file mode 100644
index 0000000..da17a41
--- /dev/null
+++ b/chrome/browser/chromeos/dom_ui/language_options_handler.h
@@ -0,0 +1,25 @@
+// 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_CHROMEOS_DOM_UI_LANGUAGE_OPTIONS_HANDLER_H_
+#define CHROME_BROWSER_CHROMEOS_DOM_UI_LANGUAGE_OPTIONS_HANDLER_H_
+
+#include "chrome/browser/dom_ui/options_ui.h"
+
+class DictionaryValue;
+
+// ChromeOS language options page UI handler.
+class LanguageOptionsHandler : public OptionsPageUIHandler {
+ public:
+ LanguageOptionsHandler();
+ virtual ~LanguageOptionsHandler();
+
+ // OptionsUIHandler implementation.
+ virtual void GetLocalizedValues(DictionaryValue* localized_strings);
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(LanguageOptionsHandler);
+};
+
+#endif // CHROME_BROWSER_CHROMEOS_DOM_UI_LANGUAGE_OPTIONS_HANDLER_H_
diff --git a/chrome/browser/dom_ui/options_ui.cc b/chrome/browser/dom_ui/options_ui.cc
index 6cd44ed..9efa714 100644
--- a/chrome/browser/dom_ui/options_ui.cc
+++ b/chrome/browser/dom_ui/options_ui.cc
@@ -43,6 +43,7 @@
#include "chrome/browser/chromeos/dom_ui/sync_options_handler.h"
#include "chrome/browser/chromeos/dom_ui/labs_handler.h"
#include "chrome/browser/chromeos/dom_ui/language_hangul_options_handler.h"
+#include "chrome/browser/chromeos/dom_ui/language_options_handler.h"
#include "chrome/browser/chromeos/dom_ui/system_options_handler.h"
#endif
@@ -115,6 +116,7 @@ OptionsUI::OptionsUI(TabContents* contents) : DOMUI(contents) {
AddOptionsPageUIHandler(localized_strings, new LabsHandler());
AddOptionsPageUIHandler(localized_strings,
new LanguageHangulOptionsHandler());
+ AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler());
#endif
AddOptionsPageUIHandler(localized_strings, new ContentSettingsHandler());
diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html
index 6bf710b..bb67fb0 100644
--- a/chrome/browser/resources/options.html
+++ b/chrome/browser/resources/options.html
@@ -50,6 +50,11 @@ function load() {
localStrings.getString('labsPage'),
'labsPage');
OptionsPage.register(labsOptions);
+ var languageSettings = new OptionsPage('language',
+ localStrings.getString(
+ 'languagePage'),
+ 'languagePage');
+ OptionsPage.registerSubPage(languageSettings);
}
var syncSettings = new OptionsPage('sync',
@@ -103,6 +108,7 @@ window.onpopstate = function(e) {
<div id="mainview">
<if expr="pp_ifdef('chromeos')">
<include src="options/chromeos_system_options.html">
+ <include src="options/chromeos_language_options.html">
<include src="options/chromeos_labs.html">
<!-- TODO(mazda): include options/chromeos_language_hangul_options.html
once the language options dialog is ready. -->
diff --git a/chrome/browser/resources/options/chromeos_language_options.html b/chrome/browser/resources/options/chromeos_language_options.html
new file mode 100644
index 0000000..c09fffc
--- /dev/null
+++ b/chrome/browser/resources/options/chromeos_language_options.html
@@ -0,0 +1,4 @@
+<div class="page hidden" id="languagePage">
+ <h1 i18n-content="languagePage"></h1>
+ <!-- TO BE IMPLEMENTED. -->
+</div>
diff --git a/chrome/browser/resources/options/chromeos_system_options.js b/chrome/browser/resources/options/chromeos_system_options.js
index 48af6ae..0f94a88 100644
--- a/chrome/browser/resources/options/chromeos_system_options.js
+++ b/chrome/browser/resources/options/chromeos_system_options.js
@@ -36,7 +36,7 @@ SystemOptions.prototype = {
}
$('language-button').onclick = function(event) {
- // TODO: Open ChromeOS language settings page.
+ OptionsPage.showPageByName('language');
};
},
};
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index d3d798d..b897d6d 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -396,6 +396,8 @@
'browser/chromeos/dom_ui/labs_handler.h',
'browser/chromeos/dom_ui/language_hangul_options_handler.cc',
'browser/chromeos/dom_ui/language_hangul_options_handler.h',
+ 'browser/chromeos/dom_ui/language_options_handler.cc',
+ 'browser/chromeos/dom_ui/language_options_handler.h',
'browser/chromeos/dom_ui/system_options_handler.cc',
'browser/chromeos/dom_ui/system_options_handler.h',
'browser/chromeos/drop_shadow_label.cc',