diff options
6 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/chromeos/input_method/ibus_input_methods.txt b/chrome/browser/chromeos/input_method/ibus_input_methods.txt index 8bf24cd..94cc5b3 100644 --- a/chrome/browser/chromeos/input_method/ibus_input_methods.txt +++ b/chrome/browser/chromeos/input_method/ibus_input_methods.txt @@ -108,7 +108,7 @@ m17n:vi:vni us vi # feature. # Other languages -hangul kr(kr104) ko +mozc-hangul kr(kr104) ko # ibus-m17n input methods. m17n:ar:kbd us ar diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc index 97a4aba..919ed24 100644 --- a/chrome/browser/chromeos/input_method/input_method_util.cc +++ b/chrome/browser/chromeos/input_method/input_method_util.cc @@ -185,7 +185,7 @@ const struct EnglishToResouceId { #endif // if defined(GOOGLE_CHROME_BUILD) { "zinnia-japanese", IDS_OPTIONS_SETTINGS_LANGUAGES_JAPANESE_HANDWRITING_INPUT_METHOD }, - { "hangul", IDS_OPTIONS_SETTINGS_LANGUAGES_KOREAN_INPUT_METHOD }, + { "mozc-hangul", IDS_OPTIONS_SETTINGS_LANGUAGES_KOREAN_INPUT_METHOD }, // For ibus-xkb-layouts engine: third_party/ibus-xkb-layouts/files { "xkb:jp::jpn", IDS_STATUSBAR_LAYOUT_JAPAN }, diff --git a/chrome/browser/chromeos/input_method/xkeyboard.cc b/chrome/browser/chromeos/input_method/xkeyboard.cc index a004255..9dc7226 100644 --- a/chrome/browser/chromeos/input_method/xkeyboard.cc +++ b/chrome/browser/chromeos/input_method/xkeyboard.cc @@ -45,6 +45,7 @@ ModifierKey kCustomizableKeys[] = { // These are the input method IDs that shouldn't remap the right alt key. const char* kKeepRightAltInputMethods[] = { "xkb:de:neo:ger", + "mozc-hangul", "xkb:il::heb", "xkb:gb:extd:eng", "xkb:fr::fra", @@ -55,7 +56,6 @@ const char* kKeepRightAltInputMethods[] = { "xkb:ca:eng:eng", "xkb:es::spa", "xkb:it::ita", - "hangul", "xkb:ua::ukr", "xkb:ch:fr:fra", "xkb:bg::bul", diff --git a/chrome/browser/chromeos/status/input_method_menu_unittest.cc b/chrome/browser/chromeos/status/input_method_menu_unittest.cc index 0312568..fe01aab 100644 --- a/chrome/browser/chromeos/status/input_method_menu_unittest.cc +++ b/chrome/browser/chromeos/status/input_method_menu_unittest.cc @@ -119,7 +119,7 @@ TEST(InputMethodMenuTest, GetTextForMenuTest) { InputMethodMenu::GetTextForMenu(desc)); } { - InputMethodDescriptor desc = GetDesc("hangul", "us", "ko"); + InputMethodDescriptor desc = GetDesc("mozc-hangul", "us", "ko"); EXPECT_EQ(L"Korean input method", InputMethodMenu::GetTextForMenu(desc)); } diff --git a/chrome/browser/resources/keyboard_overlay_data.js b/chrome/browser/resources/keyboard_overlay_data.js index 05a390d..b5e5ebf 100644 --- a/chrome/browser/resources/keyboard_overlay_data.js +++ b/chrome/browser/resources/keyboard_overlay_data.js @@ -4,7 +4,6 @@ var keyboardOverlayData = { "inputMethodIdToOverlayId": { - "hangul": "ko", "m17n:ar:kbd": "ar", "m17n:fa:isiri": "ar", "m17n:hi:itrans": "hi", @@ -20,6 +19,7 @@ var keyboardOverlayData = { "mozc": "en_US", "mozc-chewing": "zh_TW", "mozc-dv": "en_US_dvorak", + "mozc-hangul": "ko", "mozc-jp": "ja", "pinyin": "zh_CN", "pinyin-dv": "en_US_dvorak", diff --git a/tools/gen_keyboard_overlay_data/gen_keyboard_overlay_data.py b/tools/gen_keyboard_overlay_data/gen_keyboard_overlay_data.py index c04dfa3..4d7b250 100755 --- a/tools/gen_keyboard_overlay_data/gen_keyboard_overlay_data.py +++ b/tools/gen_keyboard_overlay_data/gen_keyboard_overlay_data.py @@ -92,7 +92,6 @@ LABEL_MAP = { }; INPUT_METHOD_ID_TO_OVERLAY_ID = { - 'hangul': 'ko', 'm17n:ar:kbd': 'ar', 'm17n:fa:isiri': 'ar', 'm17n:hi:itrans': 'hi', @@ -108,6 +107,7 @@ INPUT_METHOD_ID_TO_OVERLAY_ID = { 'mozc': 'en_US', 'mozc-chewing': 'zh_TW', 'mozc-dv': 'en_US_dvorak', + 'mozc-hangul': 'ko', 'mozc-jp': 'ja', 'pinyin': 'zh_CN', 'pinyin-dv': 'en_US_dvorak', |