summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/options
diff options
context:
space:
mode:
authormazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-06 04:51:56 +0000
committermazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-06 04:51:56 +0000
commit41732477840059cbdc2518e5095baf0875a81460 (patch)
tree42a06ad0f495500c5ae757a6468b3a3cbe39d6e8 /chrome/browser/chromeos/options
parent02f5d9a7e44e1e43615682f49c623132a6a5ade7 (diff)
downloadchromium_src-41732477840059cbdc2518e5095baf0875a81460.zip
chromium_src-41732477840059cbdc2518e5095baf0875a81460.tar.gz
chromium_src-41732477840059cbdc2518e5095baf0875a81460.tar.bz2
Enable the Configure buttons for opening the mozc configuration dialog.
TEST=manually on netbook BUG=chromium-os:2625 Review URL: http://codereview.chromium.org/2815049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51653 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/options')
-rw-r--r--chrome/browser/chromeos/options/language_config_view.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/options/language_config_view.cc b/chrome/browser/chromeos/options/language_config_view.cc
index 461e5ea..b1c05db 100644
--- a/chrome/browser/chromeos/options/language_config_view.cc
+++ b/chrome/browser/chromeos/options/language_config_view.cc
@@ -337,12 +337,10 @@ void LanguageConfigView::Show(Profile* profile, gfx::NativeWindow parent) {
void LanguageConfigView::InitInputMethodConfigViewMap() {
input_method_config_view_map_["chewing"] = CreateLanguageChewingConfigView;
input_method_config_view_map_["hangul"] = CreateLanguageHangulConfigView;
+ input_method_config_view_map_["mozc"] = CreateLanguageMozcConfigView;
+ input_method_config_view_map_["mozc-dv"] = CreateLanguageMozcConfigView;
+ input_method_config_view_map_["mozc-jp"] = CreateLanguageMozcConfigView;
input_method_config_view_map_["pinyin"] = CreateLanguagePinyinConfigView;
-
- // TODO(yusukes): Enable the following two mappings when ibus-mozc starts
- // supporting IBus style configs.
- // input_method_config_view_map_["mozc"] = CreateLanguageMozcConfigView;
- // input_method_config_view_map_["mozc-jp"] = CreateLanguageMozcConfigView;
}
void LanguageConfigView::OnAddLanguage(const std::string& language_code) {