diff options
| -rw-r--r-- | chrome/browser/chromeos/input_method/DEPS | 9 | ||||
| -rw-r--r-- | chrome/browser/chromeos/input_method/input_method_constants.cc | 176 | ||||
| -rw-r--r-- | chrome/browser/chromeos/input_method/input_method_constants.h | 175 | ||||
| -rw-r--r-- | chrome/browser/chromeos/input_method/input_method_manager_impl.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/chromeos/language_preferences.cc | 274 | ||||
| -rw-r--r-- | chrome/browser/chromeos/language_preferences.h | 17 | ||||
| -rw-r--r-- | chrome/browser/chromeos/preferences.cc | 43 | ||||
| -rw-r--r-- | chrome/chrome_browser_chromeos.gypi | 2 |
8 files changed, 175 insertions, 527 deletions
diff --git a/chrome/browser/chromeos/input_method/DEPS b/chrome/browser/chromeos/input_method/DEPS index a1dc2dc..052dd54 100644 --- a/chrome/browser/chromeos/input_method/DEPS +++ b/chrome/browser/chromeos/input_method/DEPS @@ -13,4 +13,13 @@ specific_include_rules = { "+chrome/test", "+content/public", ], + # TODO(erikwright): Bring this list to zero. + # + # Do not add to the list of temporarily-allowed dependencies below, + # and please do not introduce more #includes of these files. + 'input_method_manager_impl\.cc': [ + # TODO(erikwright): Much/all of language_preferences can/should be decoupled + # from chrome/browser. + "!chrome/browser/chromeos/language_preferences.h" + ], } diff --git a/chrome/browser/chromeos/input_method/input_method_constants.cc b/chrome/browser/chromeos/input_method/input_method_constants.cc deleted file mode 100644 index 4a53856..0000000 --- a/chrome/browser/chromeos/input_method/input_method_constants.cc +++ /dev/null @@ -1,176 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/chromeos/input_method/input_method_constants.h" - -namespace chromeos { -namespace input_method { - -// --------------------------------------------------------------------------- -// For ibus-daemon -// --------------------------------------------------------------------------- -const char kGeneralSectionName[] = "general"; -const char kPreloadEnginesConfigName[] = "preload_engines"; - -// --------------------------------------------------------------------------- -// For Traditional Chinese input method (ibus-mozc-chewing) -// --------------------------------------------------------------------------- -const char kChewingSectionName[] = "engine/Chewing"; - -// We have to sync the |ibus_config_name|s with those in -// ibus-chewing/files/src/Config.cc. -const char kChewingAutoShiftCur[] = "autoShiftCur"; -const char kChewingAddPhraseDirection[] = "addPhraseDirection"; -const char kChewingEasySymbolInput[] = "easySymbolInput"; -const char kChewingEscCleanAllBuf[] = "escCleanAllBuf"; -const char kChewingForceLowercaseEnglish[] = "forceLowercaseEnglish"; -const char kChewingPlainZhuyin[] = "plainZhuyin"; -const char kChewingPhraseChoiceRearward[] = "phraseChoiceRearward"; -const char kChewingSpaceAsSelection[] = "spaceAsSelection"; -const char kChewingMaxChiSymbolLen[] = "maxChiSymbolLen"; -const char kChewingCandPerPage[] = "candPerPage"; -const char kChewingKeyboardType[] = "KBType"; -const char kChewingKeyboardTypeDefault[] = "default"; -const char kChewingKeyboardTypeHsu[] = "hsu"; -const char kChewingKeyboardTypeIbm[] = "ibm"; -const char kChewingKeyboardTypeGinYieh[] = "gin_yieh"; -const char kChewingKeyboardTypeEten[] = "eten"; -const char kChewingKeyboardTypeEten26[] = "eten26"; -const char kChewingKeyboardTypeDvorak[] = "dvorak"; -const char kChewingKeyboardTypeDvorakHsu[] = "dvorak_hsu"; -const char kChewingKeyboardTypeDachen26[] = "dachen_26"; -const char kChewingKeyboardTypeHanyu[] = "hanyu"; - -const char kChewingSelKeys[] = "selKeys"; -const char kChewingSelKeys1234567890[] = "1234567890"; -const char kChewingSelKeysAsdfghjkl_[] = "asdfghjkl;"; -const char kChewingSelKeysAsdfzxcv89[] = "asdfzxcv89"; -const char kChewingSelKeysAsdfjkl789[] = "asdfjkl789"; -const char kChewingSelKeysAoeu_qjkix[] = "aoeu;qjkix"; -const char kChewingSelKeysAoeuhtnsid[] = "aoeuhtnsid"; -const char kChewingSelKeysAoeuidhtns[] = "aoeuidhtns"; -const char kChewingSelKeys1234qweras[] = "1234qweras"; - -const char kChewingHsuSelKeyType[] = "hsuSelKeyType"; -const int kChewingHsuSelKeyType1 = 1; -const int kChewingHsuSelKeyType2 = 2; - -// --------------------------------------------------------------------------- -// For Korean input method (ibus-mozc-hangul) -// --------------------------------------------------------------------------- -const char kHangulSectionName[] = "engine/Hangul"; -const char kHangulKeyboardConfigName[] = "HangulKeyboard"; - -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"; - -// We have to sync the |keyboard_id|s with those in libhangul. -const char kHangulKeyboard2Set[] = "2"; -const char kHangulKeyboard3SetFinal[] = "3f"; -const char kHangulKeyboard3Set390[] = "39"; -const char kHangulKeyboard3SetNoShift[] = "3s"; -const char kHangulKeyboardRomaja[] = "ro"; -// We don't support "Sebeolsik 2 set" keyboard. - -// --------------------------------------------------------------------------- -// For Simplified Chinese input method (ibus-mozc-pinyin) -// --------------------------------------------------------------------------- -const char kPinyinSectionName[] = "engine/Pinyin"; - -// We have to sync the |ibus_config_name|s with those in -// ibus-mozc-pinyin/files/languages/pinyin/unix/ibus/config_updater.cc. -const char kPinyinCorrectPinyin[] = "CorrectPinyin"; -const char kPinyinFuzzyPinyin[] = "FuzzyPinyin"; -const char kPinyinShiftSelectCandidate[] = "ShiftSelectCandidate"; -const char kPinyinMinusEqualPage[] = "MinusEqualPage"; -const char kPinyinCommaPeriodPage[] = "CommaPeriodPage"; -const char kPinyinAutoCommit[] = "AutoCommit"; -const char kPinyinDoublePinyin[] = "DoublePinyin"; -const char kPinyinInitChinese[] = "InitChinese"; -const char kPinyinInitFull[] = "InitFull"; -const char kPinyinInitFullPunct[] = "InitFullPunct"; -const char kPinyinInitSimplifiedChinese[] = "InitSimplifiedChinese"; -// TODO(yusukes): Support PINYIN_{INCOMPLETE,CORRECT,FUZZY}_... prefs (32 -// additional boolean prefs.) -// TODO(yusukes): Support HalfWidthPuncts and IncompletePinyin prefs if needed. - -const char kPinyinDoublePinyinSchema[] = "DoublePinyinSchema"; -const int kPinyinDoublePinyinSchemaMspy = 0; -const int kPinyinDoublePinyinSchemaZrm = 1; -const int kPinyinDoublePinyinSchemaAbc = 2; -const int kPinyinDoublePinyinSchemaZgpy = 3; -const int kPinyinDoublePinyinSchemaPyjj = 4; -const char kPinyinLookupTablePageSize[] = "LookupTablePageSize"; - -// --------------------------------------------------------------------------- -// For Japanese input method (ibus-mozc) -// --------------------------------------------------------------------------- -const char kMozcSectionName[] = "engine/Mozc"; - -const char kMozcIncognitoMode[] = "incognito_mode"; -const char kMozcUseAutoImeTurnOff[] = "use_auto_ime_turn_off"; -const char kMozcUseHistorySuggest[] = "use_history_suggest"; -const char kMozcUseDictionarySuggest[] = "use_dictionary_suggest"; - -const char kMozcPreeditMethod[] = "preedit_method"; -const char kMozcPreeditMethodRoman[] = "ROMAN"; -const char kMozcPreeditMethodKana[] = "KANA"; - -const char kMozcSessionKeymap[] = "session_keymap"; -const char kMozcSessionKeymapAtok[] = "ATOK"; -const char kMozcSessionKeymapMsime[] = "MSIME"; -const char kMozcSessionKeymapKotoeri[] = "KOTOERI"; - -const char kMozcPunctuationMethod[] = "punctuation_method"; -const char kMozcPunctuationMethodKutenTouten[] = "KUTEN_TOUTEN"; -const char kMozcPunctuationMethodCommaPeriod[] = "COMMA_PERIOD"; -const char kMozcPunctuationMethodKutenPeriod[] = "KUTEN_PERIOD"; -const char kMozcPunctuationMethodCommaTouten[] = "COMMA_TOUTEN"; - -const char kMozcSymbolMethod[] = "symbol_method"; -const char kMozcSymbolMethodCornerBracketMiddleDot[] = - "CORNER_BRACKET_MIDDLE_DOT"; -const char kMozcSymbolMethodSquareBracketSlash[] = "SQUARE_BRACKET_SLASH"; -const char kMozcSymbolMethodCornerBracketSlash[] = "CORNER_BRACKET_SLASH"; -const char kMozcSymbolMethodSquareBracketMiddleDot[] = - "SQUARE_BRACKET_MIDDLE_DOT"; - -const char kMozcSpaceCharacterForm[] = "space_character_form"; -const char kMozcSpaceCharacterFormFundamentalInputMode[] = - "FUNDAMENTAL_INPUT_MODE"; -const char kMozcSpaceCharacterFormFundamentalFullWidth[] = - "FUNDAMENTAL_FULL_WIDTH"; -const char kMozcSpaceCharacterFormFundamentalHalfWidth[] = - "FUNDAMENTAL_HALF_WIDTH"; - -const char kMozcHistoryLearningLevel[] = "history_learning_level"; -const char kMozcHistoryLearningLevelDefaultHistory[] = "DEFAULT_HISTORY"; -const char kMozcHistoryLearningLevelReadOnly[] = "READ_ONLY"; -const char kMozcHistoryLearningLevelNoHistory[] = "NO_HISTORY"; - -const char kMozcSelectionShortcut[] = "selection_shortcut"; -const char kMozcSelectionShortcutNoShortcut[] = "NO_SHORTCUT"; -const char kMozcSelectionShortcutShortcut123456789[] = "SHORTCUT_123456789"; -const char kMozcSelectionShortcutShortcutAsdfghjkl[] = "SHORTCUT_ASDFGHJKL"; - - -const char kMozcShiftKeyModeSwitch[] = "shift_key_mode_switch"; -const char kMozcShiftKeyModeSwitchOff[] = "OFF"; -const char kMozcShiftKeyModeSwitchAsciiInputMode[] = "ASCII_INPUT_MODE"; -const char kMozcShiftKeyModeSwitchKatakanaInputMode[] = "KATAKANA_INPUT_MODE"; - -const char kMozcNumpadCharacterForm[] = "numpad_character_form"; -const char kMozcNumpadCharacterFormNumpadInputMode[] = "NUMPAD_INPUT_MODE"; -const char kMozcNumpadCharacterFormNumpadFullWidth[] = "NUMPAD_FULL_WIDTH"; -const char kMozcNumpadCharacterFormNumpadHalfWidth[] = "NUMPAD_HALF_WIDTH"; -const char kMozcNumpadCharacterFormNumpadDirectInput[] = "NUMPAD_DIRECT_INPUT"; - -const char kMozcSuggestionsSize[] = "suggestions_size"; - -} // namespace input_method -} // namespace chromeos diff --git a/chrome/browser/chromeos/input_method/input_method_constants.h b/chrome/browser/chromeos/input_method/input_method_constants.h deleted file mode 100644 index c86e570..0000000 --- a/chrome/browser/chromeos/input_method/input_method_constants.h +++ /dev/null @@ -1,175 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_CONSTANTS_H_ -#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_CONSTANTS_H_ - -// This file defines configuration parameter names for ibus. -namespace chromeos { -namespace input_method { - -// --------------------------------------------------------------------------- -// For ibus-daemon -// --------------------------------------------------------------------------- -extern const char kGeneralSectionName[]; -extern const char kPreloadEnginesConfigName[]; - -// --------------------------------------------------------------------------- -// For Traditional Chinese input method (ibus-mozc-chewing) -// --------------------------------------------------------------------------- -extern const char kChewingSectionName[]; - -// We have to sync the |ibus_config_name|s with those in -// ibus-chewing/files/src/Config.cc. -extern const char kChewingAutoShiftCur[]; -extern const char kChewingAddPhraseDirection[]; -extern const char kChewingEasySymbolInput[]; -extern const char kChewingEscCleanAllBuf[]; -extern const char kChewingForceLowercaseEnglish[]; -extern const char kChewingPlainZhuyin[]; -extern const char kChewingPhraseChoiceRearward[]; -extern const char kChewingSpaceAsSelection[]; -extern const char kChewingMaxChiSymbolLen[]; -extern const char kChewingCandPerPage[]; -extern const char kChewingKeyboardType[]; -extern const char kChewingKeyboardTypeDefault[]; -extern const char kChewingKeyboardTypeHsu[]; -extern const char kChewingKeyboardTypeIbm[]; -extern const char kChewingKeyboardTypeGinYieh[]; -extern const char kChewingKeyboardTypeEten[]; -extern const char kChewingKeyboardTypeEten26[]; -extern const char kChewingKeyboardTypeDvorak[]; -extern const char kChewingKeyboardTypeDvorakHsu[]; -extern const char kChewingKeyboardTypeDachen26[]; -extern const char kChewingKeyboardTypeHanyu[]; - -extern const char kChewingSelKeys[]; -extern const char kChewingSelKeys1234567890[]; -extern const char kChewingSelKeysAsdfghjkl_[]; -extern const char kChewingSelKeysAsdfzxcv89[]; -extern const char kChewingSelKeysAsdfjkl789[]; -extern const char kChewingSelKeysAoeu_qjkix[]; -extern const char kChewingSelKeysAoeuhtnsid[]; -extern const char kChewingSelKeysAoeuidhtns[]; -extern const char kChewingSelKeys1234qweras[]; - -extern const char kChewingHsuSelKeyType[]; -extern const int kChewingHsuSelKeyType1; -extern const int kChewingHsuSelKeyType2; - -// --------------------------------------------------------------------------- -// For Korean input method (ibus-mozc-hangul) -// --------------------------------------------------------------------------- -extern const char kHangulSectionName[]; -extern const char kHangulKeyboardConfigName[]; - -extern const char kHangulHanjaBindingKeysConfigName[]; -// 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.) -extern const char kHangulHanjaBindingKeys[]; - -// We have to sync the |keyboard_id|s with those in libhangul. -extern const char kHangulKeyboard2Set[]; -extern const char kHangulKeyboard3SetFinal[]; -extern const char kHangulKeyboard3Set390[]; -extern const char kHangulKeyboard3SetNoShift[]; -extern const char kHangulKeyboardRomaja[]; -// We don't support "Sebeolsik 2 set" keyboard. - -// --------------------------------------------------------------------------- -// For Simplified Chinese input method (ibus-mozc-pinyin) -// --------------------------------------------------------------------------- -extern const char kPinyinSectionName[]; - -// We have to sync the |ibus_config_name|s with those in -// ibus-mozc-pinyin/files/languages/pinyin/unix/ibus/config_updater.cc. -extern const char kPinyinCorrectPinyin[]; -extern const char kPinyinFuzzyPinyin[]; -extern const char kPinyinShiftSelectCandidate[]; -extern const char kPinyinMinusEqualPage[]; -extern const char kPinyinCommaPeriodPage[]; -extern const char kPinyinAutoCommit[]; -extern const char kPinyinDoublePinyin[]; -extern const char kPinyinInitChinese[]; -extern const char kPinyinInitFull[]; -extern const char kPinyinInitFullPunct[]; -extern const char kPinyinInitSimplifiedChinese[]; -// TODO(yusukes): Support PINYIN_{INCOMPLETE,CORRECT,FUZZY}_... prefs (32 -// additional boolean prefs.) -// TODO(yusukes): Support HalfWidthPuncts and IncompletePinyin prefs if needed. - -extern const char kPinyinDoublePinyinSchema[]; -extern const int kPinyinDoublePinyinSchemaMspy; -extern const int kPinyinDoublePinyinSchemaZrm; -extern const int kPinyinDoublePinyinSchemaAbc; -extern const int kPinyinDoublePinyinSchemaZgpy; -extern const int kPinyinDoublePinyinSchemaPyjj; -extern const char kPinyinLookupTablePageSize[]; - -// --------------------------------------------------------------------------- -// For Japanese input method (ibus-mozc) -// --------------------------------------------------------------------------- -extern const char kMozcSectionName[]; - -extern const char kMozcIncognitoMode[]; -extern const char kMozcUseAutoImeTurnOff[]; -extern const char kMozcUseHistorySuggest[]; -extern const char kMozcUseDictionarySuggest[]; - -extern const char kMozcPreeditMethod[]; -extern const char kMozcPreeditMethodRoman[]; -extern const char kMozcPreeditMethodKana[]; - -extern const char kMozcSessionKeymap[]; -extern const char kMozcSessionKeymapAtok[]; -extern const char kMozcSessionKeymapMsime[]; -extern const char kMozcSessionKeymapKotoeri[]; - -extern const char kMozcPunctuationMethod[]; -extern const char kMozcPunctuationMethodKutenTouten[]; -extern const char kMozcPunctuationMethodCommaPeriod[]; -extern const char kMozcPunctuationMethodKutenPeriod[]; -extern const char kMozcPunctuationMethodCommaTouten[]; - -extern const char kMozcSymbolMethod[]; -extern const char kMozcSymbolMethodCornerBracketMiddleDot[]; -extern const char kMozcSymbolMethodSquareBracketSlash[]; -extern const char kMozcSymbolMethodCornerBracketSlash[]; -extern const char kMozcSymbolMethodSquareBracketMiddleDot[]; - -extern const char kMozcSpaceCharacterForm[]; -extern const char kMozcSpaceCharacterFormFundamentalInputMode[]; -extern const char kMozcSpaceCharacterFormFundamentalFullWidth[]; -extern const char kMozcSpaceCharacterFormFundamentalHalfWidth[]; - -extern const char kMozcHistoryLearningLevel[]; -extern const char kMozcHistoryLearningLevelDefaultHistory[]; -extern const char kMozcHistoryLearningLevelReadOnly[]; -extern const char kMozcHistoryLearningLevelNoHistory[]; - -extern const char kMozcSelectionShortcut[]; -extern const char kMozcSelectionShortcutNoShortcut[]; -extern const char kMozcSelectionShortcutShortcut123456789[]; -extern const char kMozcSelectionShortcutShortcutAsdfghjkl[]; - - -extern const char kMozcShiftKeyModeSwitch[]; -extern const char kMozcShiftKeyModeSwitchOff[]; -extern const char kMozcShiftKeyModeSwitchAsciiInputMode[]; -extern const char kMozcShiftKeyModeSwitchKatakanaInputMode[]; - -extern const char kMozcNumpadCharacterForm[]; -extern const char kMozcNumpadCharacterFormNumpadInputMode[]; -extern const char kMozcNumpadCharacterFormNumpadFullWidth[]; -extern const char kMozcNumpadCharacterFormNumpadHalfWidth[]; -extern const char kMozcNumpadCharacterFormNumpadDirectInput[]; - -extern const char kMozcSuggestionsSize[]; - -} // input_method -} // chromeos - -#endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_CONSTANTS_H_ diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc index 2692c2d..e4c26ec 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.cc +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.cc @@ -12,10 +12,10 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "chrome/browser/chromeos/input_method/candidate_window_controller.h" -#include "chrome/browser/chromeos/input_method/input_method_constants.h" #include "chrome/browser/chromeos/input_method/input_method_delegate.h" #include "chrome/browser/chromeos/input_method/input_method_engine_ibus.h" #include "chrome/browser/chromeos/input_method/xkeyboard.h" +#include "chrome/browser/chromeos/language_preferences.h" #include "ui/base/accelerators/accelerator.h" #include "unicode/uloc.h" @@ -219,8 +219,8 @@ bool InputMethodManagerImpl::SetInputMethodConfig( const std::string& section, const std::string& config_name, const InputMethodConfigValue& value) { - DCHECK(section != input_method::kGeneralSectionName || - config_name != input_method::kPreloadEnginesConfigName); + DCHECK(section != language_prefs::kGeneralSectionName || + config_name != language_prefs::kPreloadEnginesConfigName); if (state_ == STATE_TERMINATING) return false; diff --git a/chrome/browser/chromeos/language_preferences.cc b/chrome/browser/chromeos/language_preferences.cc index 8b9705c..77658dd 100644 --- a/chrome/browser/chromeos/language_preferences.cc +++ b/chrome/browser/chromeos/language_preferences.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "chrome/browser/chromeos/input_method/input_method_constants.h" #include "chrome/browser/chromeos/language_preferences.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" @@ -12,18 +11,23 @@ namespace chromeos { namespace language_prefs { // --------------------------------------------------------------------------- +// For ibus-daemon +// --------------------------------------------------------------------------- +const char kGeneralSectionName[] = "general"; +const char kPreloadEnginesConfigName[] = "preload_engines"; + +// --------------------------------------------------------------------------- // For Traditional Chinese input method (ibus-mozc-chewing) // --------------------------------------------------------------------------- +const char kChewingSectionName[] = "engine/Chewing"; // We have to sync the |ibus_config_name|s with those in // ibus-chewing/files/src/Config.cc. const LanguageBooleanPrefs kChewingBooleanPrefs[] = { - { prefs::kLanguageChewingAutoShiftCur, false, - input_method::kChewingAutoShiftCur, + { prefs::kLanguageChewingAutoShiftCur, false, "autoShiftCur", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_AUTO_SHIFT_CUR, PrefServiceSyncable::SYNCABLE_PREF }, - { prefs::kLanguageChewingAddPhraseDirection, false, - input_method::kChewingAddPhraseDirection, + { prefs::kLanguageChewingAddPhraseDirection, false, "addPhraseDirection", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_ADD_PHRASE_DIRECTION, PrefServiceSyncable::SYNCABLE_PREF }, /* Temporarily disabled. (crosbug.com/14185) @@ -31,8 +35,7 @@ const LanguageBooleanPrefs kChewingBooleanPrefs[] = { IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_EASY_SYMBOL_INPUT, PrefServiceSyncable::SYNCABLE_PREF }, */ - { prefs::kLanguageChewingEscCleanAllBuf, false, - input_method::kChewingEscCleanAllBuf, + { prefs::kLanguageChewingEscCleanAllBuf, false, "escCleanAllBuf", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_ESC_CLEAN_ALL_BUF, PrefServiceSyncable::SYNCABLE_PREF }, { prefs::kLanguageChewingForceLowercaseEnglish, false, @@ -40,17 +43,14 @@ const LanguageBooleanPrefs kChewingBooleanPrefs[] = { IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_FORCE_LOWER_CASE_ENGLISH, PrefServiceSyncable::SYNCABLE_PREF }, /* Temporarily disabled. (crosbug.com/14185) - { prefs::kLanguageChewingPlainZhuyin, false, - input_method::kChewingPlainZhuyin, + { prefs::kLanguageChewingPlainZhuyin, false, "plainZhuyin", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_PLAIN_ZHUYIN, PrefServiceSyncable::SYNCABLE_PREF }, */ - { prefs::kLanguageChewingPhraseChoiceRearward, true, - input_method::kChewingPhraseChoiceRearward, + { prefs::kLanguageChewingPhraseChoiceRearward, true, "phraseChoiceRearward", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_PHRASE_CHOICE_REARWARD, PrefServiceSyncable::SYNCABLE_PREF }, - { prefs::kLanguageChewingSpaceAsSelection, true, - input_method::kChewingSpaceAsSelection, + { prefs::kLanguageChewingSpaceAsSelection, true, "spaceAsSelection", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_SPACE_AS_SELECTION, PrefServiceSyncable::SYNCABLE_PREF }, }; @@ -58,13 +58,11 @@ COMPILE_ASSERT(kNumChewingBooleanPrefs == arraysize(kChewingBooleanPrefs), TheSizeShouldMatch); const LanguageIntegerRangePreference kChewingIntegerPrefs[] = { - { prefs::kLanguageChewingMaxChiSymbolLen, 20, 8, 40, - input_method::kChewingMaxChiSymbolLen, + { prefs::kLanguageChewingMaxChiSymbolLen, 20, 8, 40, "maxChiSymbolLen", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_MAX_CHI_SYMBOL_LEN, PrefServiceSyncable::SYNCABLE_PREF }, - { prefs::kLanguageChewingCandPerPage, 10, 8, 10, - input_method::kChewingCandPerPage, + { prefs::kLanguageChewingCandPerPage, 10, 8, 10, "candPerPage", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_CAND_PER_PAGE, PrefServiceSyncable::SYNCABLE_PREF }, @@ -75,49 +73,43 @@ COMPILE_ASSERT(kNumChewingIntegerPrefs == arraysize(kChewingIntegerPrefs), const LanguageMultipleChoicePreference<const char*> kChewingMultipleChoicePrefs[] = { { prefs::kLanguageChewingKeyboardType, - input_method::kChewingKeyboardTypeDefault, - input_method::kChewingKeyboardType, - {{ input_method::kChewingKeyboardTypeDefault, + "default", + "KBType", + {{ "default", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_DEFAULT }, - { input_method::kChewingKeyboardTypeHsu, - IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_HSU }, - { input_method::kChewingKeyboardTypeIbm, - IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_IBM }, - { input_method::kChewingKeyboardTypeGinYieh, + { "hsu", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_HSU }, + { "ibm", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_IBM }, + { "gin_yieh", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_GIN_YIEH }, - { input_method::kChewingKeyboardTypeEten, - IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_ETEN }, - { input_method::kChewingKeyboardTypeEten26, - IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_ETEN26 }, - { input_method::kChewingKeyboardTypeDvorak, - IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_DVORAK }, - { input_method::kChewingKeyboardTypeDvorakHsu, + { "eten", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_ETEN }, + { "eten26", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_ETEN26 }, + { "dvorak", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_DVORAK }, + { "dvorak_hsu", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_DVORAK_HSU }, - { input_method::kChewingKeyboardTypeDachen26, + { "dachen_26", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_DACHEN_26 }, - { input_method::kChewingKeyboardTypeHanyu, - IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_HANYU }}, + { "hanyu", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_HANYU }}, IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE, PrefServiceSyncable::SYNCABLE_PREF, }, { prefs::kLanguageChewingSelKeys, - input_method::kChewingSelKeys1234567890, - input_method::kChewingSelKeys, - {{ input_method::kChewingSelKeys1234567890, + "1234567890", + "selKeys", + {{ "1234567890", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SEL_KEYS_1234567890 }, - { input_method::kChewingSelKeysAsdfghjkl_, + { "asdfghjkl;", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SEL_KEYS_ASDFGHJKLS }, - { input_method::kChewingSelKeysAsdfzxcv89, + { "asdfzxcv89", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SEL_KEYS_ASDFZXCV89 }, - { input_method::kChewingSelKeysAsdfjkl789, + { "asdfjkl789", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SEL_KEYS_ASDFJKL789 }, - { input_method::kChewingSelKeysAoeu_qjkix, + { "aoeu;qjkix", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SEL_KEYS_AOEUSQJKIX }, - { input_method::kChewingSelKeysAoeuhtnsid, + { "aoeuhtnsid", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SEL_KEYS_AOEUHTNSID }, - { input_method::kChewingSelKeysAoeuidhtns, + { "aoeuidhtns", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SEL_KEYS_AOEUIDHTNS }, - { input_method::kChewingSelKeys1234qweras, + { "1234qweras", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SEL_KEYS_1234QWERAS }}, IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SEL_KEYS, PrefServiceSyncable::SYNCABLE_PREF, @@ -129,12 +121,10 @@ COMPILE_ASSERT(kNumChewingMultipleChoicePrefs == const LanguageMultipleChoicePreference<int> kChewingHsuSelKeyType = { prefs::kLanguageChewingHsuSelKeyType, - input_method::kChewingHsuSelKeyType1, - input_method::kChewingHsuSelKeyType, - {{ input_method::kChewingHsuSelKeyType1, - IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_HSU_SEL_KEY_TYPE_1 }, - { input_method::kChewingHsuSelKeyType2, - IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_HSU_SEL_KEY_TYPE_2 }}, + 1, + "hsuSelKeyType", + {{ 1, IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_HSU_SEL_KEY_TYPE_1 }, + { 2, IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_HSU_SEL_KEY_TYPE_2 }}, IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_HSU_SEL_KEY_TYPE, PrefServiceSyncable::SYNCABLE_PREF, }; @@ -142,7 +132,10 @@ const LanguageMultipleChoicePreference<int> kChewingHsuSelKeyType = { // --------------------------------------------------------------------------- // For Korean input method (ibus-mozc-hangul) // --------------------------------------------------------------------------- +const char kHangulSectionName[] = "engine/Hangul"; +const char kHangulKeyboardConfigName[] = "HangulKeyboard"; +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 @@ -151,16 +144,13 @@ const char kHangulHanjaBindingKeys[] = "F9,Ctrl 9"; const HangulKeyboardNameIDPair kHangulKeyboardNameIDPairs[] = { // We have to sync the |keyboard_id|s with those in libhangul. - { IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_KEYBOARD_2_SET, - input_method::kHangulKeyboard2Set }, + { IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_KEYBOARD_2_SET, "2" }, { IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_KEYBOARD_3_SET_FINAL, - input_method::kHangulKeyboard3SetFinal }, - { IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_KEYBOARD_3_SET_390, - input_method::kHangulKeyboard3Set390 }, + "3f" }, + { IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_KEYBOARD_3_SET_390, "39" }, { IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_KEYBOARD_3_SET_NO_SHIFT, - input_method::kHangulKeyboard3SetNoShift }, - { IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_KEYBOARD_ROMAJA, - input_method::kHangulKeyboardRomaja }, + "3s" }, + { IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_KEYBOARD_ROMAJA, "ro" }, // We don't support "Sebeolsik 2 set" keyboard. }; COMPILE_ASSERT(kNumHangulKeyboardNameIDPairs == @@ -170,48 +160,42 @@ COMPILE_ASSERT(kNumHangulKeyboardNameIDPairs == // --------------------------------------------------------------------------- // For Simplified Chinese input method (ibus-mozc-pinyin) // --------------------------------------------------------------------------- +const char kPinyinSectionName[] = "engine/Pinyin"; // We have to sync the |ibus_config_name|s with those in // ibus-mozc-pinyin/files/languages/pinyin/unix/ibus/config_updater.cc. const LanguageBooleanPrefs kPinyinBooleanPrefs[] = { - { prefs::kLanguagePinyinCorrectPinyin, true, - input_method::kPinyinCorrectPinyin, + { prefs::kLanguagePinyinCorrectPinyin, true, "CorrectPinyin", IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_CORRECT_PINYIN, PrefServiceSyncable::SYNCABLE_PREF }, - { prefs::kLanguagePinyinFuzzyPinyin, false, input_method::kPinyinFuzzyPinyin, + { prefs::kLanguagePinyinFuzzyPinyin, false, "FuzzyPinyin", IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_FUZZY_PINYIN, PrefServiceSyncable::SYNCABLE_PREF }, - { prefs::kLanguagePinyinShiftSelectCandidate, false, - input_method::kPinyinShiftSelectCandidate, + { prefs::kLanguagePinyinShiftSelectCandidate, false, "ShiftSelectCandidate", IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_SHIFT_SELECT_PINYIN, PrefServiceSyncable::SYNCABLE_PREF }, - { prefs::kLanguagePinyinMinusEqualPage, true, - input_method::kPinyinMinusEqualPage, + { prefs::kLanguagePinyinMinusEqualPage, true, "MinusEqualPage", IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_MINUS_EQUAL_PAGE, PrefServiceSyncable::SYNCABLE_PREF }, - { prefs::kLanguagePinyinCommaPeriodPage, true, - input_method::kPinyinCommaPeriodPage, + { prefs::kLanguagePinyinCommaPeriodPage, true, "CommaPeriodPage", IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_COMMA_PERIOD_PAGE, PrefServiceSyncable::SYNCABLE_PREF }, - { prefs::kLanguagePinyinAutoCommit, false, input_method::kPinyinAutoCommit, + { prefs::kLanguagePinyinAutoCommit, false, "AutoCommit", IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_AUTO_COMMIT, PrefServiceSyncable::SYNCABLE_PREF }, - { prefs::kLanguagePinyinDoublePinyin, false, - input_method::kPinyinDoublePinyin, + { prefs::kLanguagePinyinDoublePinyin, false, "DoublePinyin", IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_DOUBLE_PINYIN, PrefServiceSyncable::SYNCABLE_PREF }, - { prefs::kLanguagePinyinInitChinese, true, input_method::kPinyinInitChinese, + { prefs::kLanguagePinyinInitChinese, true, "InitChinese", IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_INIT_CHINESE, PrefServiceSyncable::SYNCABLE_PREF }, - { prefs::kLanguagePinyinInitFull, false, input_method::kPinyinInitFull, + { prefs::kLanguagePinyinInitFull, false, "InitFull", IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_INIT_FULL, PrefServiceSyncable::SYNCABLE_PREF }, - { prefs::kLanguagePinyinInitFullPunct, true, - input_method::kPinyinInitFullPunct, + { prefs::kLanguagePinyinInitFullPunct, true, "InitFullPunct", IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_INIT_FULL_PUNCT, PrefServiceSyncable::SYNCABLE_PREF }, - { prefs::kLanguagePinyinInitSimplifiedChinese, true, - input_method::kPinyinInitSimplifiedChinese, + { prefs::kLanguagePinyinInitSimplifiedChinese, true, "InitSimplifiedChinese", IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_INIT_SIMPLIFIED_CHINESE, PrefServiceSyncable::SYNCABLE_PREF }, // TODO(yusukes): Support PINYIN_{INCOMPLETE,CORRECT,FUZZY}_... prefs (32 @@ -223,26 +207,23 @@ COMPILE_ASSERT(kNumPinyinBooleanPrefs == arraysize(kPinyinBooleanPrefs), const LanguageMultipleChoicePreference<int> kPinyinDoublePinyinSchema = { prefs::kLanguagePinyinDoublePinyinSchema, - input_method::kPinyinDoublePinyinSchemaMspy, - input_method::kPinyinDoublePinyinSchema, - {{ input_method::kPinyinDoublePinyinSchemaMspy, - IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_DOUBLE_SCHEMA_MSPY}, - { input_method::kPinyinDoublePinyinSchemaZrm, - IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_DOUBLE_SCHEMA_ZRM}, - { input_method::kPinyinDoublePinyinSchemaAbc, - IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_DOUBLE_SCHEMA_ABC}, - { input_method::kPinyinDoublePinyinSchemaZgpy, - IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_DOUBLE_SCHEMA_ZGPY}, - { input_method::kPinyinDoublePinyinSchemaPyjj, - IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_DOUBLE_SCHEMA_PYJJ}}, + 0, + "DoublePinyinSchema", + {{ 0, IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_DOUBLE_SCHEMA_MSPY}, + { 1, IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_DOUBLE_SCHEMA_ZRM}, + { 2, IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_DOUBLE_SCHEMA_ABC}, + { 3, IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_DOUBLE_SCHEMA_ZGPY}, + { 4, IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_DOUBLE_SCHEMA_PYJJ}}, IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_DOUBLE_SCHEMA, PrefServiceSyncable::SYNCABLE_PREF, }; const PinyinIntegerPref kPinyinIntegerPrefs[] = { // TODO(yusukes): the type of lookup_table_page_size on ibus should be uint. - { prefs::kLanguagePinyinLookupTablePageSize, 5, - input_method::kPinyinLookupTablePageSize, + { prefs::kLanguagePinyinLookupTablePageSize, + 5, + "LookupTablePageSize", + // don't sync as it's not user configurable. PrefServiceSyncable::UNSYNCABLE_PREF } }; @@ -252,26 +233,27 @@ COMPILE_ASSERT(kNumPinyinIntegerPrefs == arraysize(kPinyinIntegerPrefs), // --------------------------------------------------------------------------- // For Japanese input method (ibus-mozc) // --------------------------------------------------------------------------- +const char kMozcSectionName[] = "engine/Mozc"; const LanguageBooleanPrefs kMozcBooleanPrefs[] = { { prefs::kLanguageMozcIncognitoMode, false, - input_method::kMozcIncognitoMode, + "incognito_mode", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_INCOGNITO_MODE, PrefServiceSyncable::SYNCABLE_PREF }, { prefs::kLanguageMozcUseAutoImeTurnOff, true, - input_method::kMozcUseAutoImeTurnOff, + "use_auto_ime_turn_off", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_USE_AUTO_IME_TURN_OFF, PrefServiceSyncable::SYNCABLE_PREF }, { prefs::kLanguageMozcUseHistorySuggest, true, - input_method::kMozcUseHistorySuggest, + "use_history_suggest", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_USE_HISTORY_SUGGEST, PrefServiceSyncable::SYNCABLE_PREF }, { prefs::kLanguageMozcUseDictionarySuggest, true, - input_method::kMozcUseDictionarySuggest, + "use_dictionary_suggest", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_USE_DICTIONARY_SUGGEST, PrefServiceSyncable::SYNCABLE_PREF }, }; @@ -281,76 +263,71 @@ COMPILE_ASSERT(kNumMozcBooleanPrefs == arraysize(kMozcBooleanPrefs), extern const LanguageMultipleChoicePreference<const char*> kMozcMultipleChoicePrefs[] = { { prefs::kLanguageMozcPreeditMethod, - input_method::kMozcPreeditMethodRoman, - input_method::kMozcPreeditMethod, - {{ input_method::kMozcPreeditMethodRoman, - IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PREEDIT_METHOD_ROMAN }, - { input_method::kMozcPreeditMethodKana, - IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PREEDIT_METHOD_KANA }}, + "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, PrefServiceSyncable::SYNCABLE_PREF, }, { prefs::kLanguageMozcSessionKeymap, - input_method::kMozcSessionKeymapMsime, - input_method::kMozcSessionKeymap, - {{ input_method::kMozcSessionKeymapAtok, - IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SESSION_KEYMAP_ATOK }, - { input_method::kMozcSessionKeymapMsime, - IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SESSION_KEYMAP_MSIME }, - { input_method::kMozcSessionKeymapKotoeri, - IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SESSION_KEYMAP_KOTOERI }}, + "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 }}, // TODO: Support "CUSTOM" keymap. IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SESSION_KEYMAP, PrefServiceSyncable::SYNCABLE_PREF, }, { prefs::kLanguageMozcPunctuationMethod, - input_method::kMozcPunctuationMethodKutenTouten, - input_method::kMozcPunctuationMethod, - {{ input_method::kMozcPunctuationMethodKutenTouten, + "KUTEN_TOUTEN", + "punctuation_method", + {{ "KUTEN_TOUTEN", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PUNCTUATION_METHOD_KUTEN_TOUTEN }, - { input_method::kMozcPunctuationMethodCommaPeriod, + { "COMMA_PERIOD", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PUNCTUATION_METHOD_COMMA_PERIOD }, - { input_method::kMozcPunctuationMethodKutenPeriod, + { "KUTEN_PERIOD", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PUNCTUATION_METHOD_KUTEN_PERIOD }, - { input_method::kMozcPunctuationMethodCommaTouten, + { "COMMA_TOUTEN", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PUNCTUATION_METHOD_COMMA_TOUTEN }}, IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_PUNCTUATION_METHOD, PrefServiceSyncable::SYNCABLE_PREF, }, { prefs::kLanguageMozcSymbolMethod, - input_method::kMozcSymbolMethodCornerBracketMiddleDot, - input_method::kMozcSymbolMethod, - {{ input_method::kMozcSymbolMethodCornerBracketMiddleDot, + "CORNER_BRACKET_MIDDLE_DOT", + "symbol_method", + {{ "CORNER_BRACKET_MIDDLE_DOT", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SYMBOL_METHOD_CORNER_BRACKET_MIDDLE_DOT }, - { input_method::kMozcSymbolMethodSquareBracketSlash, + { "SQUARE_BRACKET_SLASH", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SYMBOL_METHOD_SQUARE_BRACKET_SLASH }, - { input_method::kMozcSymbolMethodCornerBracketSlash, + { "CORNER_BRACKET_SLASH", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SYMBOL_METHOD_CORNER_BRACKET_SLASH }, - { input_method::kMozcSymbolMethodSquareBracketMiddleDot, + { "SQUARE_BRACKET_MIDDLE_DOT", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SYMBOL_METHOD_SQUARE_BRACKET_MIDDLE_DOT }}, IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SYMBOL_METHOD, PrefServiceSyncable::SYNCABLE_PREF, }, { prefs::kLanguageMozcSpaceCharacterForm, - input_method::kMozcSpaceCharacterFormFundamentalInputMode, - input_method::kMozcSpaceCharacterForm, - {{ input_method::kMozcSpaceCharacterFormFundamentalInputMode, + "FUNDAMENTAL_INPUT_MODE", + "space_character_form", + {{ "FUNDAMENTAL_INPUT_MODE", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SPACE_CHARACTER_FORM_FUNDAMENTAL_INPUT_MODE }, - { input_method::kMozcSpaceCharacterFormFundamentalFullWidth, + { "FUNDAMENTAL_FULL_WIDTH", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SPACE_CHARACTER_FORM_FUNDAMENTAL_FULL_WIDTH }, - { input_method::kMozcSpaceCharacterFormFundamentalHalfWidth, + { "FUNDAMENTAL_HALF_WIDTH", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SPACE_CHARACTER_FORM_FUNDAMENTAL_HALF_WIDTH }}, IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SPACE_CHARACTER_FORM, PrefServiceSyncable::SYNCABLE_PREF, }, { prefs::kLanguageMozcHistoryLearningLevel, - input_method::kMozcHistoryLearningLevelDefaultHistory, - input_method::kMozcHistoryLearningLevel, - {{ input_method::kMozcHistoryLearningLevelDefaultHistory, + "DEFAULT_HISTORY", + "history_learning_level", + {{ "DEFAULT_HISTORY", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_HISTORY_LEARNING_LEVEL_DEFAULT_HISTORY }, - { input_method::kMozcHistoryLearningLevelReadOnly, + { "READ_ONLY", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_HISTORY_LEARNING_LEVEL_READ_ONLY }, - { input_method::kMozcHistoryLearningLevelNoHistory, + { "NO_HISTORY", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_HISTORY_LEARNING_LEVEL_NO_HISTORY }}, IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_HISTORY_LEARNING_LEVEL, PrefServiceSyncable::SYNCABLE_PREF, @@ -358,39 +335,39 @@ extern const LanguageMultipleChoicePreference<const char*> // TODO(mazda): Uncomment this block once the candidate window in Chrome OS // supports changing shortcut labels. // { prefs::kLanguageMozcSelectionShortcut, - // input_method::kMozcSelectionShortcutShortcut123456789, - // input_method::kMozcSelectionShortcut, - // {{ input_method::kMozcSelectionShortcutNoShortcut, + // "SHORTCUT_123456789", + // "selection_shortcut", + // {{ "NO_SHORTCUT", // IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SELECTION_SHORTCUT_NO_SHORTCUT }, - // { input_method::kMozcSelectionShortcutShortcut123456789, + // { "SHORTCUT_123456789", // IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SELECTION_SHORTCUT_SHORTCUT_123456789 }, - // { input_method::kMozcSelectionShortcutShortcutAsdfghjkl, + // { "SHORTCUT_ASDFGHJKL", // IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SELECTION_SHORTCUT_SHORTCUT_ASDFGHJKL }}, // IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SELECTION_SHORTCUT, // PrefServiceSyncable::SYNCABLE_PREF, // }, { prefs::kLanguageMozcShiftKeyModeSwitch, - input_method::kMozcShiftKeyModeSwitchAsciiInputMode, - input_method::kMozcShiftKeyModeSwitch, - {{ input_method::kMozcShiftKeyModeSwitchOff, + "ASCII_INPUT_MODE", + "shift_key_mode_switch", + {{ "OFF", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SHIFT_KEY_MODE_SWITCH_OFF }, - { input_method::kMozcShiftKeyModeSwitchAsciiInputMode, + { "ASCII_INPUT_MODE", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SHIFT_KEY_MODE_SWITCH_ASCII_INPUT_MODE }, - { input_method::kMozcShiftKeyModeSwitchKatakanaInputMode, + { "KATAKANA_INPUT_MODE", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SHIFT_KEY_MODE_SWITCH_KATAKANA_INPUT_MODE }}, IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SHIFT_KEY_MODE_SWITCH, PrefServiceSyncable::SYNCABLE_PREF, }, { prefs::kLanguageMozcNumpadCharacterForm, - input_method::kMozcNumpadCharacterFormNumpadHalfWidth, - input_method::kMozcNumpadCharacterForm, - {{ input_method::kMozcNumpadCharacterFormNumpadInputMode, + "NUMPAD_HALF_WIDTH", + "numpad_character_form", + {{ "NUMPAD_INPUT_MODE", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_NUMPAD_CHARACTER_FORM_NUMPAD_INPUT_MODE }, - { input_method::kMozcNumpadCharacterFormNumpadFullWidth, + { "NUMPAD_FULL_WIDTH", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_NUMPAD_CHARACTER_FORM_NUMPAD_FULL_WIDTH }, - { input_method::kMozcNumpadCharacterFormNumpadHalfWidth, + { "NUMPAD_HALF_WIDTH", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_NUMPAD_CHARACTER_FORM_NUMPAD_HALF_WIDTH }, - { input_method::kMozcNumpadCharacterFormNumpadDirectInput, + { "NUMPAD_DIRECT_INPUT", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_NUMPAD_CHARACTER_FORM_NUMPAD_DIRECT_INPUT }}, IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_NUMPAD_CHARACTER_FORM, PrefServiceSyncable::SYNCABLE_PREF, @@ -401,8 +378,7 @@ COMPILE_ASSERT(kNumMozcMultipleChoicePrefs == TheSizeShouldMatch); const LanguageIntegerRangePreference kMozcIntegerPrefs[] = { - { prefs::kLanguageMozcSuggestionsSize, 3, 1, 9, - input_method::kMozcSuggestionsSize, + { prefs::kLanguageMozcSuggestionsSize, 3, 1, 9, "suggestions_size", IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SUGGESTIONS_SIZE, PrefServiceSyncable::SYNCABLE_PREF } }; diff --git a/chrome/browser/chromeos/language_preferences.h b/chrome/browser/chromeos/language_preferences.h index 556c625..19c0031 100644 --- a/chrome/browser/chromeos/language_preferences.h +++ b/chrome/browser/chromeos/language_preferences.h @@ -61,6 +61,17 @@ struct LanguageIntegerRangePreference { PrefServiceSyncable::PrefSyncStatus sync_status; }; +// --------------------------------------------------------------------------- +// For ibus-daemon +// --------------------------------------------------------------------------- +extern const char kGeneralSectionName[]; +extern const char kPreloadEnginesConfigName[]; + +// --------------------------------------------------------------------------- +// For Traditional Chinese input method (ibus-mozc-chewing) +// --------------------------------------------------------------------------- +extern const char kChewingSectionName[]; + extern const LanguageBooleanPrefs kChewingBooleanPrefs[]; // This is not ideal, but we should hard-code the number here as the value // is referenced in other header files as array sizes. We have a @@ -83,6 +94,10 @@ extern const LanguageMultipleChoicePreference<int> kChewingHsuSelKeyType; // --------------------------------------------------------------------------- // For Korean input method (ibus-mozc-hangul) // --------------------------------------------------------------------------- +extern const char kHangulSectionName[]; +extern const char kHangulKeyboardConfigName[]; +extern const char kHangulHanjaBindingKeysConfigName[]; +extern const char kHangulHanjaBindingKeys[]; struct HangulKeyboardNameIDPair { int message_id; @@ -96,6 +111,7 @@ const size_t kNumHangulKeyboardNameIDPairs = 5; // --------------------------------------------------------------------------- // For Simplified Chinese input method (ibus-mozc-pinyin) // --------------------------------------------------------------------------- +extern const char kPinyinSectionName[]; extern const LanguageBooleanPrefs kPinyinBooleanPrefs[]; // See comments at kNumChewingBooleanPrefs for why we hard-code this here. @@ -117,6 +133,7 @@ const size_t kNumPinyinIntegerPrefs = 1; // --------------------------------------------------------------------------- // For Japanese input method (ibus-mozc) // --------------------------------------------------------------------------- +extern const char kMozcSectionName[]; extern const LanguageBooleanPrefs kMozcBooleanPrefs[]; // See comments at kNumChewingBooleanPrefs for why we hard-code this here. diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index c243afc..f7df26a 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -15,7 +15,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/drive/drive_file_system_util.h" #include "chrome/browser/chromeos/input_method/input_method_configuration.h" -#include "chrome/browser/chromeos/input_method/input_method_constants.h" #include "chrome/browser/chromeos/input_method/input_method_manager.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" #include "chrome/browser/chromeos/input_method/xkeyboard.h" @@ -194,7 +193,7 @@ void Preferences::RegisterUserPrefs(PrefServiceSyncable* prefs) { language_prefs::kHangulKeyboardNameIDPairs[0].keyboard_id, PrefServiceSyncable::SYNCABLE_PREF); prefs->RegisterStringPref(prefs::kLanguageHangulHanjaBindingKeys, - input_method::kHangulHanjaBindingKeys, + language_prefs::kHangulHanjaBindingKeys, // Don't sync the pref as it's not user-configurable PrefServiceSyncable::UNSYNCABLE_PREF); for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) { @@ -537,8 +536,8 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) { if (!pref_name) { SetInputMethodList(); } else if (*pref_name == prefs::kLanguagePreloadEngines) { - SetLanguageConfigStringListAsCSV(input_method::kGeneralSectionName, - input_method::kPreloadEnginesConfigName, + SetLanguageConfigStringListAsCSV(language_prefs::kGeneralSectionName, + language_prefs::kPreloadEnginesConfigName, preload_engines_.GetValue()); } @@ -559,7 +558,7 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) { if (!pref_name || *pref_name == language_prefs::kChewingBooleanPrefs[i].pref_name) { SetLanguageConfigBoolean( - input_method::kChewingSectionName, + language_prefs::kChewingSectionName, language_prefs::kChewingBooleanPrefs[i].ibus_config_name, chewing_boolean_prefs_[i].GetValue()); } @@ -569,7 +568,7 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) { *pref_name == language_prefs::kChewingMultipleChoicePrefs[i].pref_name) { SetLanguageConfigString( - input_method::kChewingSectionName, + language_prefs::kChewingSectionName, language_prefs::kChewingMultipleChoicePrefs[i].ibus_config_name, chewing_multiple_choice_prefs_[i].GetValue()); } @@ -577,7 +576,7 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) { if (!pref_name || *pref_name == language_prefs::kChewingHsuSelKeyType.pref_name) { SetLanguageConfigInteger( - input_method::kChewingSectionName, + language_prefs::kChewingSectionName, language_prefs::kChewingHsuSelKeyType.ibus_config_name, chewing_hsu_sel_key_type_.GetValue()); } @@ -585,27 +584,27 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) { if (!pref_name || *pref_name == language_prefs::kChewingIntegerPrefs[i].pref_name) { SetLanguageConfigInteger( - input_method::kChewingSectionName, + language_prefs::kChewingSectionName, language_prefs::kChewingIntegerPrefs[i].ibus_config_name, chewing_integer_prefs_[i].GetValue()); } } if (!pref_name || *pref_name == prefs::kLanguageHangulKeyboard) { - SetLanguageConfigString(input_method::kHangulSectionName, - input_method::kHangulKeyboardConfigName, + SetLanguageConfigString(language_prefs::kHangulSectionName, + language_prefs::kHangulKeyboardConfigName, hangul_keyboard_.GetValue()); } if (!pref_name || *pref_name == prefs::kLanguageHangulHanjaBindingKeys) { - SetLanguageConfigString(input_method::kHangulSectionName, - input_method::kHangulHanjaBindingKeysConfigName, + SetLanguageConfigString(language_prefs::kHangulSectionName, + language_prefs::kHangulHanjaBindingKeysConfigName, hangul_hanja_binding_keys_.GetValue()); } for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) { if (!pref_name || *pref_name == language_prefs::kPinyinBooleanPrefs[i].pref_name) { SetLanguageConfigBoolean( - input_method::kPinyinSectionName, + language_prefs::kPinyinSectionName, language_prefs::kPinyinBooleanPrefs[i].ibus_config_name, pinyin_boolean_prefs_[i].GetValue()); } @@ -614,7 +613,7 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) { if (!pref_name || *pref_name == language_prefs::kPinyinIntegerPrefs[i].pref_name) { SetLanguageConfigInteger( - input_method::kPinyinSectionName, + language_prefs::kPinyinSectionName, language_prefs::kPinyinIntegerPrefs[i].ibus_config_name, pinyin_int_prefs_[i].GetValue()); } @@ -622,7 +621,7 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) { if (!pref_name || *pref_name == language_prefs::kPinyinDoublePinyinSchema.pref_name) { SetLanguageConfigInteger( - input_method::kPinyinSectionName, + language_prefs::kPinyinSectionName, language_prefs::kPinyinDoublePinyinSchema.ibus_config_name, pinyin_double_pinyin_schema_.GetValue()); } @@ -630,7 +629,7 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) { if (!pref_name || *pref_name == language_prefs::kMozcBooleanPrefs[i].pref_name) { SetLanguageConfigBoolean( - input_method::kMozcSectionName, + language_prefs::kMozcSectionName, language_prefs::kMozcBooleanPrefs[i].ibus_config_name, mozc_boolean_prefs_[i].GetValue()); } @@ -639,7 +638,7 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) { if (!pref_name || *pref_name == language_prefs::kMozcMultipleChoicePrefs[i].pref_name) { SetLanguageConfigString( - input_method::kMozcSectionName, + language_prefs::kMozcSectionName, language_prefs::kMozcMultipleChoicePrefs[i].ibus_config_name, mozc_multiple_choice_prefs_[i].GetValue()); } @@ -648,7 +647,7 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) { if (!pref_name || *pref_name == language_prefs::kMozcIntegerPrefs[i].pref_name) { SetLanguageConfigInteger( - input_method::kMozcSectionName, + language_prefs::kMozcSectionName, language_prefs::kMozcIntegerPrefs[i].ibus_config_name, mozc_integer_prefs_[i].GetValue()); } @@ -743,8 +742,8 @@ void Preferences::SetLanguageConfigStringListAsCSV(const char* section, if (!value.empty()) base::SplitString(value, ',', &split_values); - if (section == std::string(input_method::kGeneralSectionName) && - name == std::string(input_method::kPreloadEnginesConfigName)) { + if (section == std::string(language_prefs::kGeneralSectionName) && + name == std::string(language_prefs::kPreloadEnginesConfigName)) { input_method_manager_->EnableInputMethods(split_values); return; } @@ -763,8 +762,8 @@ void Preferences::SetInputMethodList() { const std::string previous_input_method_id = previous_input_method_.GetValue(); const std::string current_input_method_id = current_input_method_.GetValue(); - SetLanguageConfigStringListAsCSV(input_method::kGeneralSectionName, - input_method::kPreloadEnginesConfigName, + SetLanguageConfigStringListAsCSV(language_prefs::kGeneralSectionName, + language_prefs::kPreloadEnginesConfigName, preload_engines_.GetValue()); // ChangeInputMethod() has to be called AFTER the value of |preload_engines_| diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi index a9983e2..c9f735c 100644 --- a/chrome/chrome_browser_chromeos.gypi +++ b/chrome/chrome_browser_chromeos.gypi @@ -328,8 +328,6 @@ 'browser/chromeos/input_method/input_method_config.h', 'browser/chromeos/input_method/input_method_configuration.cc', 'browser/chromeos/input_method/input_method_configuration.h', - 'browser/chromeos/input_method/input_method_constants.cc', - 'browser/chromeos/input_method/input_method_constants.h', 'browser/chromeos/input_method/input_method_delegate.h', 'browser/chromeos/input_method/input_method_delegate_impl.cc', 'browser/chromeos/input_method/input_method_delegate_impl.h', |