diff options
author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-28 00:41:27 +0000 |
---|---|---|
committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-28 00:41:27 +0000 |
commit | ffa7c166bb7637fb05c8726aedc92ea92fe628ee (patch) | |
tree | 096cfc4afe5882f4206d77373174d4fccde52b76 /chrome | |
parent | 4f4c97577640d26eff8b1e532eb83336988836df (diff) | |
download | chromium_src-ffa7c166bb7637fb05c8726aedc92ea92fe628ee.zip chromium_src-ffa7c166bb7637fb05c8726aedc92ea92fe628ee.tar.gz chromium_src-ffa7c166bb7637fb05c8726aedc92ea92fe628ee.tar.bz2 |
Add Mozc (Japanese IME) configuration DOM UI skeleton.
This only includes boolean settings in the dialog.
I will fill in other stuff in later CLs.
BUG=chromium-os:4809
TEST=manually check on the netbook by uncommenting TODO lines.
Review URL: http://codereview.chromium.org/3067006
Patch from Takayoshi Kochi <kochi@chromium.org>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/chromeos/dom_ui/language_mozc_options_handler.cc | 28 | ||||
-rw-r--r-- | chrome/browser/chromeos/dom_ui/language_mozc_options_handler.h | 26 | ||||
-rw-r--r-- | chrome/browser/dom_ui/core_options_handler.cc | 3 | ||||
-rw-r--r-- | chrome/browser/dom_ui/options_ui.cc | 3 | ||||
-rw-r--r-- | chrome/browser/resources/options.html | 9 | ||||
-rw-r--r-- | chrome/browser/resources/options/chromeos_language_mozc_options.html | 71 | ||||
-rw-r--r-- | chrome/chrome_browser.gypi | 6 |
7 files changed, 144 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/dom_ui/language_mozc_options_handler.cc b/chrome/browser/chromeos/dom_ui/language_mozc_options_handler.cc new file mode 100644 index 0000000..456006b --- /dev/null +++ b/chrome/browser/chromeos/dom_ui/language_mozc_options_handler.cc @@ -0,0 +1,28 @@ +// 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_mozc_options_handler.h" + +#include "app/l10n_util.h" +#include "base/values.h" +#include "chrome/browser/chromeos/dom_ui/language_options_util.h" +#include "chrome/browser/chromeos/language_preferences.h" +#include "grit/generated_resources.h" + +LanguageMozcOptionsHandler::LanguageMozcOptionsHandler() { +} + +LanguageMozcOptionsHandler::~LanguageMozcOptionsHandler() { +} + +void LanguageMozcOptionsHandler::GetLocalizedValues( + DictionaryValue* localized_strings) { + DCHECK(localized_strings); + // Language Mozc page - ChromeOS + for (size_t i = 0; i < chromeos::kNumMozcBooleanPrefs; ++i) { + localized_strings->SetString( + GetI18nContentValue(chromeos::kMozcBooleanPrefs[i]), + l10n_util::GetString(chromeos::kMozcBooleanPrefs[i].message_id)); + } +} diff --git a/chrome/browser/chromeos/dom_ui/language_mozc_options_handler.h b/chrome/browser/chromeos/dom_ui/language_mozc_options_handler.h new file mode 100644 index 0000000..6e7da2e --- /dev/null +++ b/chrome/browser/chromeos/dom_ui/language_mozc_options_handler.h @@ -0,0 +1,26 @@ +// 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_MOZC_OPTIONS_HANDLER_H_ +#define CHROME_BROWSER_CHROMEOS_DOM_UI_LANGUAGE_MOZC_OPTIONS_HANDLER_H_ +#pragma once + +#include "chrome/browser/dom_ui/options_ui.h" + +class DictionaryValue; + +// Mozc options page UI handler. +class LanguageMozcOptionsHandler : public OptionsPageUIHandler { + public: + LanguageMozcOptionsHandler(); + virtual ~LanguageMozcOptionsHandler(); + + // OptionsUIHandler implementation. + virtual void GetLocalizedValues(DictionaryValue* localized_strings); + + private: + DISALLOW_COPY_AND_ASSIGN(LanguageMozcOptionsHandler); +}; + +#endif // CHROME_BROWSER_CHROMEOS_DOM_UI_LANGUAGE_MOZC_OPTIONS_HANDLER_H_ diff --git a/chrome/browser/dom_ui/core_options_handler.cc b/chrome/browser/dom_ui/core_options_handler.cc index 19cc0ae..5025e6f 100644 --- a/chrome/browser/dom_ui/core_options_handler.cc +++ b/chrome/browser/dom_ui/core_options_handler.cc @@ -59,6 +59,9 @@ void CoreOptionsHandler::GetLocalizedValues( localized_strings->SetString(L"languageHangulPage", l10n_util::GetString( IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_TITLE)); + localized_strings->SetString(L"languageMozcPage", + l10n_util::GetString( + IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SETTINGS_TITLE)); localized_strings->SetString(L"languagePinyinPage", l10n_util::GetString( IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTINGS_TITLE)); diff --git a/chrome/browser/dom_ui/options_ui.cc b/chrome/browser/dom_ui/options_ui.cc index 1c8a4c7..003702c 100644 --- a/chrome/browser/dom_ui/options_ui.cc +++ b/chrome/browser/dom_ui/options_ui.cc @@ -50,6 +50,7 @@ #include "chrome/browser/chromeos/dom_ui/labs_handler.h" #include "chrome/browser/chromeos/dom_ui/language_chewing_options_handler.h" #include "chrome/browser/chromeos/dom_ui/language_hangul_options_handler.h" +#include "chrome/browser/chromeos/dom_ui/language_mozc_options_handler.h" #include "chrome/browser/chromeos/dom_ui/language_options_handler.h" #include "chrome/browser/chromeos/dom_ui/language_pinyin_options_handler.h" #include "chrome/browser/chromeos/dom_ui/system_options_handler.h" @@ -137,6 +138,8 @@ OptionsUI::OptionsUI(TabContents* contents) : DOMUI(contents) { new LanguageChewingOptionsHandler()); AddOptionsPageUIHandler(localized_strings, new LanguageHangulOptionsHandler()); + AddOptionsPageUIHandler(localized_strings, + new LanguageMozcOptionsHandler()); AddOptionsPageUIHandler(localized_strings, new LanguageOptionsHandler()); AddOptionsPageUIHandler(localized_strings, new LanguagePinyinOptionsHandler()); diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html index 45c90f2..f239394 100644 --- a/chrome/browser/resources/options.html +++ b/chrome/browser/resources/options.html @@ -60,6 +60,14 @@ function load() { // 'languageHangul', // localStrings.getString('languageHangulPage'), // 'languageHangulPage')); + // OptionsPage.register(new OptionsPage( + // 'languageMozc', + // localStrings.getString('languageMozcPage'), + // 'languageMozcPage')); + // OptionsPage.register(new OptionsPage( + // 'languagePinyin', + // localStrings.getString('languagePinyinPage'), + // 'languagePinyinPage')); } OptionsPage.register(BrowserOptions.getInstance()); @@ -146,6 +154,7 @@ window.onpopstate = function(e) { dialog is ready. - options/chromeos_language_chewing_options.html - options/chromeos_language_hangul_options.html + - options/chromeos_language_mozc_options.html - options/chromeos_language_pinyin_options.html --> </if> diff --git a/chrome/browser/resources/options/chromeos_language_mozc_options.html b/chrome/browser/resources/options/chromeos_language_mozc_options.html new file mode 100644 index 0000000..c2ff8fc --- /dev/null +++ b/chrome/browser/resources/options/chromeos_language_mozc_options.html @@ -0,0 +1,71 @@ +<div class="page hidden" id="languageMozcPage"> + <h1 i18n-content="languageMozcPage"></h1> + <section> + <table class="option-control-table"> + <tr> + <td class="option-name" colspan="2"><label><input + id="mozc-incognito-mode" + pref="settings.language.mozc_incognito_mode" + type="checkbox"> + <span i18n-content="incognito_modeContent"></span></label> + </td> + </tr> + <tr> + <td class="option-name" colspan="2"><label><input + id="mozc-use-auto-ime-turn-off" + pref="settings.language.mozc_use_auto_ime_turn_off" + type="checkbox"> + <span i18n-content="use_auto_ime_turn_offContent"></span></label> + </td> + </tr> + <tr> + <td class="option-name" colspan="2"><label><input + id="mozc-use-date-conversion" + pref="settings.language.mozc_use_date_conversion" + type="checkbox"> + <span i18n-content="use_date_conversionContent"></span></label> + </td> + </tr> + <tr> + <td class="option-name" colspan="2"><label><input + id="mozc-use-single-kanji-conversion" + pref="settings.language.mozc_use_single_kanji_conversion" + type="checkbox"> + <span i18n-content="use_single_kanji_conversionContent"></span></label> + </td> + </tr> + <tr> + <td class="option-name" colspan="2"><label><input + id="mozc-use-symbol-conversion" + pref="settings.language.mozc_use_symbol_conversion" + type="checkbox"> + <span i18n-content="use_symbol_conversionContent"></span></label> + </td> + </tr> + <tr> + <td class="option-name" colspan="2"><label><input + id="mozc-use-number-conversion" + pref="settings.language.mozc_use_number_conversion" + type="checkbox"> + <span i18n-content="use_number_conversionContent"></span></label> + </td> + </tr> + <tr> + <td class="option-name" colspan="2"><label><input + id="mozc-use-history-suggest" + pref="settings.language.mozc_use_history_suggest" + type="checkbox"> + <span i18n-content="use_history_suggestContent"></span></label> + </td> + </tr> + <tr> + <td class="option-name" colspan="2"><label><input + id="mozc-use-dictionary-suggest" + pref="settings.language.mozc_use_dictionary_suggest" + type="checkbox"> + <span i18n-content="use_dictionary_suggestContent"></span></label> + </td> + </tr> + </table> + </section> +</div> diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 6e280d4..8f28623 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -406,10 +406,12 @@ 'browser/chromeos/dom_ui/language_chewing_options_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_pinyin_options_handler.cc', - 'browser/chromeos/dom_ui/language_pinyin_options_handler.h', + 'browser/chromeos/dom_ui/language_mozc_options_handler.cc', + 'browser/chromeos/dom_ui/language_mozc_options_handler.h', 'browser/chromeos/dom_ui/language_options_handler.cc', 'browser/chromeos/dom_ui/language_options_handler.h', + 'browser/chromeos/dom_ui/language_pinyin_options_handler.cc', + 'browser/chromeos/dom_ui/language_pinyin_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', |