summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authoryusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-11 09:05:52 +0000
committeryusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-11 09:05:52 +0000
commit100c6f6443d64527ec10afbcb4dc16a5919fef52 (patch)
tree77e55de58ce9a51af35f4bde5752cad578742694 /chrome
parent5196b0cded7f952e8faf1f06230b1fda786a707a (diff)
downloadchromium_src-100c6f6443d64527ec10afbcb4dc16a5919fef52.zip
chromium_src-100c6f6443d64527ec10afbcb4dc16a5919fef52.tar.gz
chromium_src-100c6f6443d64527ec10afbcb4dc16a5919fef52.tar.bz2
Synchronize Input Method and Keyboard preferences.
Sync Chewing prefs, Mozc prefs (except prefs::kLanguageMozcSelectionShortcut since it's not yet configurable), XKB prefs, and prefs::kLanguagePinyinDoublePinyinSchema (now it's configurable). BUG=chromium-os:4551 TEST=none Review URL: http://codereview.chromium.org/3142006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55694 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/sync/glue/synchronized_preferences.h62
1 files changed, 41 insertions, 21 deletions
diff --git a/chrome/browser/sync/glue/synchronized_preferences.h b/chrome/browser/sync/glue/synchronized_preferences.h
index ac09e1d..103f84d 100644
--- a/chrome/browser/sync/glue/synchronized_preferences.h
+++ b/chrome/browser/sync/glue/synchronized_preferences.h
@@ -115,11 +115,42 @@ static const char* kSynchronizedPreferences[] = {
#if defined(OS_CHROMEOS)
// IME prefs
+ prefs::kLanguageChewingAddPhraseDirection,
+ prefs::kLanguageChewingAutoShiftCur,
+ prefs::kLanguageChewingCandPerPage,
+ prefs::kLanguageChewingEasySymbolInput,
+ prefs::kLanguageChewingEscCleanAllBuf,
+ prefs::kLanguageChewingForceLowercaseEnglish,
+ prefs::kLanguageChewingHsuSelKeyType,
+ prefs::kLanguageChewingKeyboardType,
+ prefs::kLanguageChewingMaxChiSymbolLen,
+ prefs::kLanguageChewingPhraseChoiceRearward,
+ prefs::kLanguageChewingPlainZhuyin,
+ prefs::kLanguageChewingSelKeys,
+ prefs::kLanguageChewingSpaceAsSelection,
prefs::kLanguageHangulKeyboard,
+ prefs::kLanguageMozcHistoryLearningLevel,
+ prefs::kLanguageMozcIncognitoMode,
+ prefs::kLanguageMozcNumpadCharacterForm,
+ prefs::kLanguageMozcPreeditMethod,
+ prefs::kLanguageMozcPunctuationMethod,
+ prefs::kLanguageMozcSessionKeymap,
+ prefs::kLanguageMozcShiftKeyModeSwitch,
+ prefs::kLanguageMozcSpaceCharacterForm,
+ prefs::kLanguageMozcSuggestionsSize,
+ prefs::kLanguageMozcSymbolMethod,
+ prefs::kLanguageMozcUseAutoImeTurnOff,
+ prefs::kLanguageMozcUseDateConversion,
+ prefs::kLanguageMozcUseDictionarySuggest,
+ prefs::kLanguageMozcUseHistorySuggest,
+ prefs::kLanguageMozcUseNumberConversion,
+ prefs::kLanguageMozcUseSingleKanjiConversion,
+ prefs::kLanguageMozcUseSymbolConversion,
prefs::kLanguagePinyinAutoCommit,
prefs::kLanguagePinyinCommaPeriodPage,
prefs::kLanguagePinyinCorrectPinyin,
prefs::kLanguagePinyinDoublePinyin,
+ prefs::kLanguagePinyinDoublePinyinSchema,
prefs::kLanguagePinyinFuzzyPinyin,
prefs::kLanguagePinyinInitChinese,
prefs::kLanguagePinyinInitFull,
@@ -130,34 +161,23 @@ static const char* kSynchronizedPreferences[] = {
prefs::kLanguagePinyinTradCandidate,
prefs::kLanguagePreferredLanguages,
prefs::kLanguagePreloadEngines,
- // TODO(yusukes): Add prefs for ibus-mozc (Japanese input method).
- // prefs::kLanguageMozcPreeditMethod,
- // prefs::kLanguageMozcSessionKeymap,
- // prefs::kLanguageMozcPunctuationMethod,
- // prefs::kLanguageMozcSymbolMethod,
- // prefs::kLanguageMozcSpaceCharacterForm;
- // prefs::kLanguageMozcHistoryLearningLevel;
- // prefs::kLanguageMozcSelectionShortcut;
- // prefs::kLanguageMozcShiftKeyModeSwitch;
- // prefs::kLanguageMozcNumpadCharacterForm;
- // prefs::kLanguageMozcIncognitoMode,
- // prefs::kLanguageMozcUseAutoImeTurnOff,
- // prefs::kLanguageMozcUseDateConversion,
- // prefs::kLanguageMozcUseSingleKanjiConversion,
- // prefs::kLanguageMozcUseSymbolConversion,
- // prefs::kLanguageMozcUseNumberConversion,
- // prefs::kLanguageMozcUseHistorySuggest,
- // prefs::kLanguageMozcUseDictionarySuggest,
- // prefs::kLanguageMozcSuggestionsSize
- //
+
// We don't sync the following IME prefs since they are not user-configurable
// (yet):
+ // prefs::kLanguageHangulHanjaKeys,
// prefs::kLanguageHotkeyNextEngineInMenu,
// prefs::kLanguageHotkeyPreviousEngine,
- // prefs::kLanguagePinyinDoublePinyinSchema,
+ // prefs::kLanguageMozcSelectionShortcut,
// prefs::kLanguagePinyinLookupTablePageSize,
//
// We don't sync prefs::kLanguageCurrentInputMethod and PreviousInputMethod.
+
+ // Keyboard prefs
+ prefs::kLanguageXkbAutoRepeatDelay,
+ prefs::kLanguageXkbAutoRepeatEnabled,
+ prefs::kLanguageXkbAutoRepeatInterval,
+ // TODO(mazda): Remove kLanguageXkbModifierRemap when issue5152 gets fixed.
+ prefs::kLanguageXkbModifierRemap,
#endif
};