Revert "Activate ibus-mozc-hangul and replace from ibus-hangul."

This reverts commit a1aa3f9. BUG=None TEST=None TBR=nona@chromium.org Review URL: http://codereview.chromium.org/7472023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93311 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Jul 21, 2011 · 5a138d8 · 5a138d8
1 parent dd3977c
commit 5a138d8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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
-mozc-hangul	kr(kr104)	ko
+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
@@ -185,7 +185,7 @@ const struct EnglishToResouceId {
 #endif  // if defined(GOOGLE_CHROME_BUILD)
   { "zinnia-japanese",
     IDS_OPTIONS_SETTINGS_LANGUAGES_JAPANESE_HANDWRITING_INPUT_METHOD },
-  { "mozc-hangul", IDS_OPTIONS_SETTINGS_LANGUAGES_KOREAN_INPUT_METHOD },
+  { "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
@@ -45,7 +45,6 @@ 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",
@@ -56,6 +55,7 @@ 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/resources/keyboard_overlay_data.js b/chrome/browser/resources/keyboard_overlay_data.js
@@ -4,6 +4,7 @@
 
 var keyboardOverlayData = {
   "inputMethodIdToOverlayId": {
+    "hangul": "ko",
     "m17n:ar:kbd": "ar",
     "m17n:fa:isiri": "ar",
     "m17n:hi:itrans": "hi",
@@ -19,7 +20,6 @@ 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
@@ -92,6 +92,7 @@
 };
 
 INPUT_METHOD_ID_TO_OVERLAY_ID = {
+  'hangul': 'ko',
   'm17n:ar:kbd': 'ar',
   'm17n:fa:isiri': 'ar',
   'm17n:hi:itrans': 'hi',
@@ -107,7 +108,6 @@
   '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',