Remove ibus-hangul support.

BUG=None
TEST=try

Review URL: http://codereview.chromium.org/7608019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96168 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 5 insertions, 36 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 86face9..a80ff21 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -12774,9 +12774,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_STATUSBAR_IME_JAPANESE_IME_STATUS_WIDE_LATIN" desc="In the language menu button, this shows a character set in use is set to wide Latin.">
         Wide Latin
       </message>
-      <message name="IDS_STATUSBAR_IME_KOREAN_HANJA_MODE" desc="In the language menu button, this shows the input mode.">
-        Enable/Disable Hanja mode
-      </message>
       <message name="IDS_STATUSBAR_IME_KOREAN_HANJA_INPUT_MODE" desc="In the language menu button, this shows the input mode.">
         Hanja mode
       </message>
diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc
index 919ed24..16c0f22 100644
--- a/chrome/browser/chromeos/input_method/input_method_util.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util.cc
@@ -117,10 +117,6 @@ const struct EnglishToResouceId {
   { "Latin", IDS_STATUSBAR_IME_JAPANESE_IME_STATUS_LATIN },
   { "Wide Latin", IDS_STATUSBAR_IME_JAPANESE_IME_STATUS_WIDE_LATIN },
 
-  // For ibus-hangul: third_party/ibus-hangul/files/po/.
-  // TODO(nona): Remove ibus-hangul support.
-  { "Enable/Disable Hanja mode", IDS_STATUSBAR_IME_KOREAN_HANJA_MODE },
-
   // For ibus-mozc-hangul
   { "Hanja mode", IDS_STATUSBAR_IME_KOREAN_HANJA_INPUT_MODE },
   { "Hangul mode", IDS_STATUSBAR_IME_KOREAN_HANGUL_INPUT_MODE },
diff --git a/chrome/browser/chromeos/language_preferences.cc b/chrome/browser/chromeos/language_preferences.cc
index cfefc9d..2f5509f 100644
--- a/chrome/browser/chromeos/language_preferences.cc
+++ b/chrome/browser/chromeos/language_preferences.cc
@@ -143,18 +143,16 @@ const LanguageMultipleChoicePreference<int> kChewingHsuSelKeyType = {
 // ---------------------------------------------------------------------------
 const char kHangulSectionName[] = "engine/Hangul";
 const char kHangulKeyboardConfigName[] = "HangulKeyboard";
-const char kHangulHanjaKeysConfigName[] = "HanjaKeys";
-// We add Control+9 since F9 key is reserved by the window manager.
-// TODO: HanjaKeys are not configurable yet (and we're not sure if it should.)
-const char kHangulHanjaKeys[] = "F9,Hangul_Hanja,Control+9";
 
-// Mozc-hangul treats Hangul_Hanja key as hanja key event even if it is not set.
 const char kHangulHanjaBindingKeysConfigName[] = "HanjaKeyBindings";
+// Mozc-hangul treats Hangul_Hanja key as hanja key event even if it is not set.
+// We add Control+9 since F9 key is reserved by the window manager.
+// TODO(nona): Hanja keys are not configurable yet (and we're not sure if it
+// should.)
 const char kHangulHanjaBindingKeys[] = "F9,Ctrl 9";
 
 const HangulKeyboardNameIDPair kHangulKeyboardNameIDPairs[] = {
-  // We have to sync the |keyboard_id|s with those in
-  // ibus-hangul/files/setup/main.py.
+  // We have to sync the |keyboard_id|s with those in libhangul.
   { IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_KEYBOARD_2_SET, "2" },
   { IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_KEYBOARD_3_SET_FINAL,
     "3f" },
diff --git a/chrome/browser/chromeos/language_preferences.h b/chrome/browser/chromeos/language_preferences.h
index 33e5ede..85a4a5a 100644
--- a/chrome/browser/chromeos/language_preferences.h
+++ b/chrome/browser/chromeos/language_preferences.h
@@ -94,11 +94,6 @@ extern const LanguageMultipleChoicePreference<int> kChewingHsuSelKeyType;
 // ---------------------------------------------------------------------------
 extern const char kHangulSectionName[];
 extern const char kHangulKeyboardConfigName[];
-extern const char kHangulHanjaKeysConfigName[];
-extern const char kHangulHanjaKeys[];
-
-// Following configuration is for mozc-hangul and same meaning of
-// kHangulHanjaKeys.
 extern const char kHangulHanjaBindingKeysConfigName[];
 extern const char kHangulHanjaBindingKeys[];
 
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index 3314427..40571d8 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -110,10 +110,6 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) {
       prefs::kLanguageHangulKeyboard,
       language_prefs::kHangulKeyboardNameIDPairs[0].keyboard_id,
       PrefService::SYNCABLE_PREF);
-  prefs->RegisterStringPref(prefs::kLanguageHangulHanjaKeys,
-                            language_prefs::kHangulHanjaKeys,
-                            // Don't sync the pref as it's not user-configurable
-                            PrefService::UNSYNCABLE_PREF);
   prefs->RegisterStringPref(prefs::kLanguageHangulHanjaBindingKeys,
                             language_prefs::kHangulHanjaBindingKeys,
                             // Don't sync the pref as it's not user-configurable
@@ -237,8 +233,6 @@ void Preferences::Init(PrefService* prefs) {
         language_prefs::kChewingIntegerPrefs[i].pref_name, prefs, this);
   }
   language_hangul_keyboard_.Init(prefs::kLanguageHangulKeyboard, prefs, this);
-  language_hangul_hanja_keys_.Init(
-      prefs::kLanguageHangulHanjaKeys, prefs, this);
   language_hangul_hanja_binding_keys_.Init(
       prefs::kLanguageHangulHanjaBindingKeys, prefs, this);
   for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) {
@@ -406,11 +400,6 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) {
                             language_prefs::kHangulKeyboardConfigName,
                             language_hangul_keyboard_.GetValue());
   }
-  if (!pref_name || *pref_name == prefs::kLanguageHangulHanjaKeys) {
-    SetLanguageConfigString(language_prefs::kHangulSectionName,
-                            language_prefs::kHangulHanjaKeysConfigName,
-                            language_hangul_hanja_keys_.GetValue());
-  }
   if (!pref_name || *pref_name == prefs::kLanguageHangulHanjaBindingKeys) {
     SetLanguageConfigString(language_prefs::kHangulSectionName,
                             language_prefs::kHangulHanjaBindingKeysConfigName,
diff --git a/chrome/browser/chromeos/status/input_method_menu.cc b/chrome/browser/chromeos/status/input_method_menu.cc
index 81a99b1..6c0fa3f 100644
--- a/chrome/browser/chromeos/status/input_method_menu.cc
+++ b/chrome/browser/chromeos/status/input_method_menu.cc
@@ -108,8 +108,6 @@ const struct {
   { "m17n:zh:cangjie", "\xe5\x80\x89" },  // U+5009
   { "m17n:zh:quick", "\xe9\x80\x9f" },  // U+901F
   // For Hangul input method.
-  // TODO(nona): Remove ibus-hangul support.
-  { "hangul", "\xed\x95\x9c" },  // U+D55C
   { "mozc-hangul", "\xed\x95\x9c" },  // U+D55C
 };
 const size_t kMappingFromIdToIndicatorTextLen =
diff --git a/chrome/browser/resources/options/language_options.js b/chrome/browser/resources/options/language_options.js
index e92f5fa..3398f3c 100644
--- a/chrome/browser/resources/options/language_options.js
+++ b/chrome/browser/resources/options/language_options.js
@@ -12,8 +12,6 @@ cr.define('options', function() {
   // Some input methods like Chinese Pinyin have config pages.
   // This is the map of the input method names to their config page names.
   const INPUT_METHOD_ID_TO_CONFIG_PAGE_NAME = {
-    // TODO(nona): Remove ibus-hangul support.
-    'hangul': 'languageHangul',
     'mozc': 'languageMozc',
     'mozc-chewing': 'languageChewing',
     'mozc-dv': 'languageMozc',
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 073b6aa..c98c204 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -378,7 +378,6 @@ const char kLanguageChewingHsuSelKeyType[] =
 
 // A string pref which determines the keyboard layout for Hangul input method.
 const char kLanguageHangulKeyboard[] = "settings.language.hangul_keyboard";
-const char kLanguageHangulHanjaKeys[] = "settings.language.hangul_hanja_keys";
 const char kLanguageHangulHanjaBindingKeys[] =
     "settings.language.hangul_hanja_binding_keys";
 
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 790935e..e78340a 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -125,7 +125,6 @@ extern const char kLanguageChewingSelKeys[];
 extern const char kLanguageChewingHsuSelKeyType[];
 extern const char kLanguageHangulKeyboard[];
 extern const char kLanguageHangulHanjaBindingKeys[];
-extern const char kLanguageHangulHanjaKeys[];
 extern const char kLanguagePinyinCorrectPinyin[];
 extern const char kLanguagePinyinFuzzyPinyin[];
 extern const char kLanguagePinyinLookupTablePageSize[];