Add the remaining Enum types of Mozc configs.

The original patch was written by mazda@chromium.org.
http://codereview.chromium.org/2453003/show

BUG=chromium-os:2625
TEST=manual

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

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

2 files changed, 83 insertions, 18 deletions

diff --git a/chrome/browser/chromeos/language_preferences.h b/chrome/browser/chromeos/language_preferences.h
index 61f3598..dfb6e38 100644
--- a/chrome/browser/chromeos/language_preferences.h
+++ b/chrome/browser/chromeos/language_preferences.h
@@ -235,51 +235,116 @@ const size_t kNumPinyinIntegerPrefs = ARRAYSIZE_UNSAFE(kPinyinIntegerPrefs);
 // For Japanese input method (ibus-mozc)
 const char kMozcSectionName[] = "engine/Mozc";
 
+#define IDS_MOZC(suffix) \
+    IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_##suffix
+
 const LanguageMultipleChoicePreference<const char*>
     kMozcMultipleChoicePrefs[] = {
   { prefs::kLanguageMozcPreeditMethod,
     "ROMAN",
     "preedit_method",
-    {{ "ROMAN", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PREEDIT_METHOD_ROMAN },
-     { "KANA", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PREEDIT_METHOD_KANA }},
-    IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PREEDIT_METHOD,
+    {{ "ROMAN", IDS_MOZC(PREEDIT_METHOD_ROMAN) },
+     { "KANA", IDS_MOZC(PREEDIT_METHOD_KANA) }},
+    IDS_MOZC(PREEDIT_METHOD),
   },
   { prefs::kLanguageMozcSessionKeymap,
     "MSIME",
     "session_keymap",
-    {{ "ATOK", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SESSION_KEYMAP_ATOK },
-     { "MSIME", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SESSION_KEYMAP_MSIME },
-     { "KOTOERI", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SESSION_KEYMAP_KOTOERI }},
+    {{ "ATOK", IDS_MOZC(SESSION_KEYMAP_ATOK) },
+     { "MSIME", IDS_MOZC(SESSION_KEYMAP_MSIME) },
+     { "KOTOERI", IDS_MOZC(SESSION_KEYMAP_KOTOERI) }},
     // TODO: Support "CUSTOM" keymap.
-    IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SESSION_KEYMAP,
+    IDS_MOZC(SESSION_KEYMAP),
   },
   { prefs::kLanguageMozcPunctuationMethod,
     "KUTEN_TOTEN",
     "punctuation_method",
     {{ "KUTEN_TOUTEN",
-       IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PUNCTUATION_METHOD_KUTEN_TOUTEN },
+       IDS_MOZC(PUNCTUATION_METHOD_KUTEN_TOUTEN) },
      { "COMMA_PERIOD",
-       IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PUNCTUATION_METHOD_COMMA_PERIOD },
+       IDS_MOZC(PUNCTUATION_METHOD_COMMA_PERIOD) },
      { "KUTEN_PERIOD",
-       IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PUNCTUATION_METHOD_KUTEN_PERIOD },
+       IDS_MOZC(PUNCTUATION_METHOD_KUTEN_PERIOD) },
      { "COMMA_TOUTEN",
-       IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PUNCTUATION_METHOD_COMMA_TOUTEN }},
-    IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PUNCTUATION_METHOD,
+       IDS_MOZC(PUNCTUATION_METHOD_COMMA_TOUTEN) }},
+    IDS_MOZC(PUNCTUATION_METHOD),
   },
   { prefs::kLanguageMozcSymbolMethod,
     "CORNER_BRACKET_MIDDLE_DOT",
     "symbol_method",
     {{ "CORNER_BRACKET_MIDDLE_DOT",
-       IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SYMBOL_CORNER_BRACKET_MIDDLE_DOT },
+       IDS_MOZC(SYMBOL_METHOD_CORNER_BRACKET_MIDDLE_DOT) },
      { "SQUARE_BRACKET_SLASH",
-       IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SYMBOL_SQUARE_BRACKET_SLASH },
+       IDS_MOZC(SYMBOL_METHOD_SQUARE_BRACKET_SLASH) },
      { "CORNER_BRACKET_SLASH",
-       IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SYMBOL_CORNER_BRACKET_SLASH },
+       IDS_MOZC(SYMBOL_METHOD_CORNER_BRACKET_SLASH) },
      { "SQUARE_BRACKET_MIDDLE_DOT",
-       IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SYMBOL_SQUARE_BRACKET_MIDDLE_DOT }},
-    IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SYMBOL_METHOD,
+       IDS_MOZC(SYMBOL_METHOD_SQUARE_BRACKET_MIDDLE_DOT) }},
+    IDS_MOZC(SYMBOL_METHOD),
+  },
+  { prefs::kLanguageMozcSpaceCharacterForm,
+    "FUNDAMENTAL_INPUT_MODE",
+    "space_character_form",
+    {{ "FUNDAMENTAL_INPUT_MODE",
+       IDS_MOZC(SPACE_CHARACTER_FORM_FUNDAMENTAL_INPUT_MODE) },
+     { "FUNDAMENTAL_FULL_WIDTH",
+       IDS_MOZC(SPACE_CHARACTER_FORM_FUNDAMENTAL_FULL_WIDTH) },
+     { "FUNDAMENTAL_HALF_WIDTH",
+       IDS_MOZC(SPACE_CHARACTER_FORM_FUNDAMENTAL_HALF_WIDTH) }},
+    IDS_MOZC(SPACE_CHARACTER_FORM),
+  },
+  { prefs::kLanguageMozcHistoryLearningLevel,
+    "DEFAULT_HISTORY",
+    "history_learning_level",
+    {{ "DEFAULT_HISTORY",
+       IDS_MOZC(HISTORY_LEARNING_LEVEL_DEFAULT_HISTORY) },
+     { "READ_ONLY",
+       IDS_MOZC(HISTORY_LEARNING_LEVEL_READ_ONLY) },
+     { "NO_HISTORY",
+       IDS_MOZC(HISTORY_LEARNING_LEVEL_NO_HISTORY) }},
+    IDS_MOZC(HISTORY_LEARNING_LEVEL),
+  },
+  // TODO(mazda): Uncomment this block once the candidate window in Chrome OS
+  // supports changing shortcut labels.
+  // { prefs::kLanguageMozcSelectionShortcut,
+  //   "SHORTCUT_123456789",
+  //   "selection_shortcut",
+  //   {{ "NO_SHORTCUT",
+  //      IDS_MOZC(SELECTION_SHORTCUT_NO_SHORTCUT) },
+  //    { "SHORTCUT_123456789",
+  //      IDS_MOZC(SELECTION_SHORTCUT_SHORTCUT_123456789) },
+  //    { "SHORTCUT_ASDFGHJKL",
+  //      IDS_MOZC(SELECTION_SHORTCUT_SHORTCUT_ASDFGHJKL) }},
+  //   IDS_MOZC(SELECTION_SHORTCUT),
+  // },
+  { prefs::kLanguageMozcShiftKeyModeSwitch,
+    "ASCII_INPUT_MODE",
+    "shift_key_mode_switch",
+    {{ "OFF",
+       IDS_MOZC(SHIFT_KEY_MODE_SWITCH_OFF) },
+     { "ASCII_INPUT_MODE",
+       IDS_MOZC(SHIFT_KEY_MODE_SWITCH_ASCII_INPUT_MODE) },
+     { "KATAKANA_INPUT_MODE",
+       IDS_MOZC(SHIFT_KEY_MODE_SWITCH_KATAKANA_INPUT_MODE) }},
+    IDS_MOZC(SHIFT_KEY_MODE_SWITCH),
+  },
+  { prefs::kLanguageMozcNumpadCharacterForm,
+    "NUMPAD_HALF_WIDTH",
+    "numpad_character_form",
+    {{ "NUMPAD_INPUT_MODE",
+       IDS_MOZC(NUMPAD_CHARACTER_FORM_NUMPAD_INPUT_MODE) },
+     { "NUMPAD_FULL_WIDTH",
+       IDS_MOZC(NUMPAD_CHARACTER_FORM_NUMPAD_FULL_WIDTH) },
+     { "NUMPAD_HALF_WIDTH",
+       IDS_MOZC(NUMPAD_CHARACTER_FORM_NUMPAD_HALF_WIDTH) },
+     { "NUMPAD_DIRECT_INPUT",
+       IDS_MOZC(NUMPAD_CHARACTER_FORM_NUMPAD_DIRECT_INPUT) }},
+    IDS_MOZC(NUMPAD_CHARACTER_FORM),
   },
 };
+
+#undef IDS_MOZC
+
 const size_t kNumMozcMultipleChoicePrefs = arraysize(kMozcMultipleChoicePrefs);
 
 // For Traditional Chinese input methods (ibus-pinyin-bopomofo and ibus-chewing)
diff --git a/chrome/browser/chromeos/options/language_config_util.h b/chrome/browser/chromeos/options/language_config_util.h
index 455593c..cc80ee7 100644
--- a/chrome/browser/chromeos/options/language_config_util.h
+++ b/chrome/browser/chromeos/options/language_config_util.h
@@ -86,7 +86,7 @@ class LanguageCombobox : public views::Combobox {
   }
 
  private:
-  static const int kMinComboboxWidth = 100;
+  static const int kMinComboboxWidth = 250;
 
   DISALLOW_COPY_AND_ASSIGN(LanguageCombobox);
 };