diff options
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/chromeos/language_preferences.cc | 127 | ||||
-rw-r--r-- | chrome/browser/chromeos/language_preferences.h | 19 | ||||
-rw-r--r-- | chrome/browser/chromeos/language_preferences_unittest.cc | 4 | ||||
-rw-r--r-- | chrome/browser/chromeos/preferences.cc | 11 |
4 files changed, 89 insertions, 72 deletions
diff --git a/chrome/browser/chromeos/language_preferences.cc b/chrome/browser/chromeos/language_preferences.cc index e699eaa..6cf9667 100644 --- a/chrome/browser/chromeos/language_preferences.cc +++ b/chrome/browser/chromeos/language_preferences.cc @@ -32,35 +32,47 @@ const char kChewingSectionName[] = "engine/Chewing"; // ibus-chewing/files/src/Config.cc. const LanguageBooleanPrefs kChewingBooleanPrefs[] = { { prefs::kLanguageChewingAutoShiftCur, false, "autoShiftCur", - IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_AUTO_SHIFT_CUR}, + IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_AUTO_SHIFT_CUR, + PrefService::SYNCABLE_PREF }, { prefs::kLanguageChewingAddPhraseDirection, false, "addPhraseDirection", - IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_ADD_PHRASE_DIRECTION}, + IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_ADD_PHRASE_DIRECTION, + PrefService::SYNCABLE_PREF }, /* Temporarily disabled. (crosbug.com/14185) { prefs::kLanguageChewingEasySymbolInput, true, "easySymbolInput", - IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_EASY_SYMBOL_INPUT}, + IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_EASY_SYMBOL_INPUT, + PrefService::SYNCABLE_PREF }, */ { prefs::kLanguageChewingEscCleanAllBuf, false, "escCleanAllBuf", - IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_ESC_CLEAN_ALL_BUF}, + IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_ESC_CLEAN_ALL_BUF, + PrefService::SYNCABLE_PREF }, { prefs::kLanguageChewingForceLowercaseEnglish, false, "forceLowercaseEnglish", - IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_FORCE_LOWER_CASE_ENGLISH}, + IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_FORCE_LOWER_CASE_ENGLISH, + PrefService::SYNCABLE_PREF }, /* Temporarily disabled. (crosbug.com/14185) { prefs::kLanguageChewingPlainZhuyin, false, "plainZhuyin", - IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_PLAIN_ZHUYIN}, + IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_PLAIN_ZHUYIN, + PrefService::SYNCABLE_PREF }, */ { prefs::kLanguageChewingPhraseChoiceRearward, true, "phraseChoiceRearward", - IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_PHRASE_CHOICE_REARWARD}, + IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_PHRASE_CHOICE_REARWARD, + PrefService::SYNCABLE_PREF }, { prefs::kLanguageChewingSpaceAsSelection, true, "spaceAsSelection", - IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_SPACE_AS_SELECTION}, + IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_SPACE_AS_SELECTION, + PrefService::SYNCABLE_PREF }, }; COMPILE_ASSERT(kNumChewingBooleanPrefs == arraysize(kChewingBooleanPrefs), TheSizeShouldMatch); const LanguageIntegerRangePreference kChewingIntegerPrefs[] = { { prefs::kLanguageChewingMaxChiSymbolLen, 20, 8, 40, "maxChiSymbolLen", - IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_MAX_CHI_SYMBOL_LEN}, + IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_MAX_CHI_SYMBOL_LEN, + PrefService::SYNCABLE_PREF + }, { prefs::kLanguageChewingCandPerPage, 10, 8, 10, "candPerPage", - IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_CAND_PER_PAGE}, + IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTING_CAND_PER_PAGE, + PrefService::SYNCABLE_PREF + }, }; COMPILE_ASSERT(kNumChewingIntegerPrefs == arraysize(kChewingIntegerPrefs), TheSizeShouldMatch); @@ -85,6 +97,7 @@ const LanguageMultipleChoicePreference<const char*> IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_DACHEN_26 }, { "hanyu", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE_HANYU }}, IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_KEYBOARD_TYPE, + PrefService::SYNCABLE_PREF, }, { prefs::kLanguageChewingSelKeys, "1234567890", @@ -106,6 +119,7 @@ const LanguageMultipleChoicePreference<const char*> { "1234qweras", IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SEL_KEYS_1234QWERAS }}, IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SEL_KEYS, + PrefService::SYNCABLE_PREF, }, }; COMPILE_ASSERT(kNumChewingMultipleChoicePrefs == @@ -119,6 +133,7 @@ const LanguageMultipleChoicePreference<int> kChewingHsuSelKeyType = { {{ 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, + PrefService::SYNCABLE_PREF, }; // --------------------------------------------------------------------------- @@ -155,27 +170,38 @@ const char kPinyinSectionName[] = "engine/Pinyin"; // ibus-pinyin/files/src/Config.cc. const LanguageBooleanPrefs kPinyinBooleanPrefs[] = { { prefs::kLanguagePinyinCorrectPinyin, true, "CorrectPinyin", - IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_CORRECT_PINYIN }, + IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_CORRECT_PINYIN, + PrefService::SYNCABLE_PREF }, { prefs::kLanguagePinyinFuzzyPinyin, false, "FuzzyPinyin", - IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_FUZZY_PINYIN }, + IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_FUZZY_PINYIN, + PrefService::SYNCABLE_PREF }, { prefs::kLanguagePinyinShiftSelectCandidate, false, "ShiftSelectCandidate", - IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_SHIFT_SELECT_PINYIN }, + IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_SHIFT_SELECT_PINYIN, + PrefService::SYNCABLE_PREF }, { prefs::kLanguagePinyinMinusEqualPage, true, "MinusEqualPage", - IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_MINUS_EQUAL_PAGE }, + IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_MINUS_EQUAL_PAGE, + PrefService::SYNCABLE_PREF }, { prefs::kLanguagePinyinCommaPeriodPage, true, "CommaPeriodPage", - IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_COMMA_PERIOD_PAGE }, + IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_COMMA_PERIOD_PAGE, + PrefService::SYNCABLE_PREF }, { prefs::kLanguagePinyinAutoCommit, false, "AutoCommit", - IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_AUTO_COMMIT }, + IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_AUTO_COMMIT, + PrefService::SYNCABLE_PREF }, { prefs::kLanguagePinyinDoublePinyin, false, "DoublePinyin", - IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_DOUBLE_PINYIN }, + IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_DOUBLE_PINYIN, + PrefService::SYNCABLE_PREF }, { prefs::kLanguagePinyinInitChinese, true, "InitChinese", - IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_INIT_CHINESE }, + IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_INIT_CHINESE, + PrefService::SYNCABLE_PREF }, { prefs::kLanguagePinyinInitFull, false, "InitFull", - IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_INIT_FULL }, + IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_INIT_FULL, + PrefService::SYNCABLE_PREF }, { prefs::kLanguagePinyinInitFullPunct, true, "InitFullPunct", - IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_INIT_FULL_PUNCT }, + IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_INIT_FULL_PUNCT, + PrefService::SYNCABLE_PREF }, { prefs::kLanguagePinyinInitSimplifiedChinese, true, "InitSimplifiedChinese", - IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_INIT_SIMPLIFIED_CHINESE }, + IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTING_INIT_SIMPLIFIED_CHINESE, + PrefService::SYNCABLE_PREF }, // TODO(yusukes): Support PINYIN_{INCOMPLETE,CORRECT,FUZZY}_... prefs (32 // additional boolean prefs.) }; @@ -193,11 +219,13 @@ const LanguageMultipleChoicePreference<int> kPinyinDoublePinyinSchema = { { 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, + PrefService::SYNCABLE_PREF, }; const PinyinIntegerPref kPinyinIntegerPrefs[] = { // TODO(yusukes): the type of lookup_table_page_size on ibus should be uint. - { prefs::kLanguagePinyinLookupTablePageSize, 5, "LookupTablePageSize" }, + { prefs::kLanguagePinyinLookupTablePageSize, 5, "LookupTablePageSize", + PrefService::UNSYNCABLE_PREF } // don't sync as it's not user configurable. }; COMPILE_ASSERT(kNumPinyinIntegerPrefs == arraysize(kPinyinIntegerPrefs), TheSizeShouldMatch); @@ -214,43 +242,43 @@ const LanguageBooleanPrefs kMozcBooleanPrefs[] = { { prefs::kLanguageMozcIncognitoMode, false, "incognito_mode", - IDS_MOZC(INCOGNITO_MODE) - }, + IDS_MOZC(INCOGNITO_MODE), + PrefService::SYNCABLE_PREF }, { prefs::kLanguageMozcUseAutoImeTurnOff, true, "use_auto_ime_turn_off", - IDS_MOZC(USE_AUTO_IME_TURN_OFF) - }, + IDS_MOZC(USE_AUTO_IME_TURN_OFF), + PrefService::SYNCABLE_PREF }, { prefs::kLanguageMozcUseDateConversion, true, "use_date_conversion", - IDS_MOZC(USE_DATE_CONVERSION) - }, + IDS_MOZC(USE_DATE_CONVERSION), + PrefService::SYNCABLE_PREF }, { prefs::kLanguageMozcUseSingleKanjiConversion, true, "use_single_kanji_conversion", - IDS_MOZC(USE_SINGLE_KANJI_CONVERSION) - }, + IDS_MOZC(USE_SINGLE_KANJI_CONVERSION), + PrefService::SYNCABLE_PREF }, { prefs::kLanguageMozcUseSymbolConversion, true, "use_symbol_conversion", - IDS_MOZC(USE_SYMBOL_CONVERSION) - }, + IDS_MOZC(USE_SYMBOL_CONVERSION), + PrefService::SYNCABLE_PREF }, { prefs::kLanguageMozcUseNumberConversion, true, "use_number_conversion", - IDS_MOZC(USE_NUMBER_CONVERSION) - }, + IDS_MOZC(USE_NUMBER_CONVERSION), + PrefService::SYNCABLE_PREF }, { prefs::kLanguageMozcUseHistorySuggest, true, "use_history_suggest", - IDS_MOZC(USE_HISTORY_SUGGEST) - }, + IDS_MOZC(USE_HISTORY_SUGGEST), + PrefService::SYNCABLE_PREF }, { prefs::kLanguageMozcUseDictionarySuggest, true, "use_dictionary_suggest", - IDS_MOZC(USE_DICTIONARY_SUGGEST) - }, + IDS_MOZC(USE_DICTIONARY_SUGGEST), + PrefService::SYNCABLE_PREF }, }; COMPILE_ASSERT(kNumMozcBooleanPrefs == arraysize(kMozcBooleanPrefs), TheSizeShouldMatch); @@ -263,6 +291,7 @@ extern const LanguageMultipleChoicePreference<const char*> {{ "ROMAN", IDS_MOZC(PREEDIT_METHOD_ROMAN) }, { "KANA", IDS_MOZC(PREEDIT_METHOD_KANA) }}, IDS_MOZC(PREEDIT_METHOD), + PrefService::SYNCABLE_PREF, }, { prefs::kLanguageMozcSessionKeymap, "MSIME", @@ -272,6 +301,7 @@ extern const LanguageMultipleChoicePreference<const char*> { "KOTOERI", IDS_MOZC(SESSION_KEYMAP_KOTOERI) }}, // TODO: Support "CUSTOM" keymap. IDS_MOZC(SESSION_KEYMAP), + PrefService::SYNCABLE_PREF, }, { prefs::kLanguageMozcPunctuationMethod, "KUTEN_TOUTEN", @@ -285,6 +315,7 @@ extern const LanguageMultipleChoicePreference<const char*> { "COMMA_TOUTEN", IDS_MOZC(PUNCTUATION_METHOD_COMMA_TOUTEN) }}, IDS_MOZC(PUNCTUATION_METHOD), + PrefService::SYNCABLE_PREF, }, { prefs::kLanguageMozcSymbolMethod, "CORNER_BRACKET_MIDDLE_DOT", @@ -298,6 +329,7 @@ extern const LanguageMultipleChoicePreference<const char*> { "SQUARE_BRACKET_MIDDLE_DOT", IDS_MOZC(SYMBOL_METHOD_SQUARE_BRACKET_MIDDLE_DOT) }}, IDS_MOZC(SYMBOL_METHOD), + PrefService::SYNCABLE_PREF, }, { prefs::kLanguageMozcSpaceCharacterForm, "FUNDAMENTAL_INPUT_MODE", @@ -309,6 +341,7 @@ extern const LanguageMultipleChoicePreference<const char*> { "FUNDAMENTAL_HALF_WIDTH", IDS_MOZC(SPACE_CHARACTER_FORM_FUNDAMENTAL_HALF_WIDTH) }}, IDS_MOZC(SPACE_CHARACTER_FORM), + PrefService::SYNCABLE_PREF, }, { prefs::kLanguageMozcHistoryLearningLevel, "DEFAULT_HISTORY", @@ -320,6 +353,7 @@ extern const LanguageMultipleChoicePreference<const char*> { "NO_HISTORY", IDS_MOZC(HISTORY_LEARNING_LEVEL_NO_HISTORY) }}, IDS_MOZC(HISTORY_LEARNING_LEVEL), + PrefService::SYNCABLE_PREF, }, // TODO(mazda): Uncomment this block once the candidate window in Chrome OS // supports changing shortcut labels. @@ -333,6 +367,7 @@ extern const LanguageMultipleChoicePreference<const char*> // { "SHORTCUT_ASDFGHJKL", // IDS_MOZC(SELECTION_SHORTCUT_SHORTCUT_ASDFGHJKL) }}, // IDS_MOZC(SELECTION_SHORTCUT), + // PrefService::SYNCABLE_PREF, // }, { prefs::kLanguageMozcShiftKeyModeSwitch, "ASCII_INPUT_MODE", @@ -344,6 +379,7 @@ extern const LanguageMultipleChoicePreference<const char*> { "KATAKANA_INPUT_MODE", IDS_MOZC(SHIFT_KEY_MODE_SWITCH_KATAKANA_INPUT_MODE) }}, IDS_MOZC(SHIFT_KEY_MODE_SWITCH), + PrefService::SYNCABLE_PREF, }, { prefs::kLanguageMozcNumpadCharacterForm, "NUMPAD_HALF_WIDTH", @@ -357,6 +393,7 @@ extern const LanguageMultipleChoicePreference<const char*> { "NUMPAD_DIRECT_INPUT", IDS_MOZC(NUMPAD_CHARACTER_FORM_NUMPAD_DIRECT_INPUT) }}, IDS_MOZC(NUMPAD_CHARACTER_FORM), + PrefService::SYNCABLE_PREF, }, }; COMPILE_ASSERT(kNumMozcMultipleChoicePrefs == @@ -365,7 +402,7 @@ COMPILE_ASSERT(kNumMozcMultipleChoicePrefs == const LanguageIntegerRangePreference kMozcIntegerPrefs[] = { { prefs::kLanguageMozcSuggestionsSize, 3, 1, 9, "suggestions_size", - IDS_MOZC(SUGGESTIONS_SIZE)}, + IDS_MOZC(SUGGESTIONS_SIZE), PrefService::SYNCABLE_PREF } }; COMPILE_ASSERT(kNumMozcIntegerPrefs == arraysize(kMozcIntegerPrefs), TheSizeShouldMatch); @@ -375,18 +412,6 @@ COMPILE_ASSERT(kNumMozcIntegerPrefs == arraysize(kMozcIntegerPrefs), // --------------------------------------------------------------------------- // For keyboard stuff // --------------------------------------------------------------------------- -const LanguageMultipleChoicePreference<int> kXkbModifierMultipleChoicePrefs = { - NULL, // don't use this field since the config is associated with 3 prefs. - kNoRemap, - NULL, // does not use the ibus configuration service. - {{ kNoRemap, IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_MODIFIER_NO_REMAP }, - { kSwapCtrlAndAlt, - IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_MODIFIER_REMAP_CTRL_ALT }, - { kSwapSearchAndCtrl, - IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_MODIFIER_REMAP_SEARCH_CTRL }}, - 0, // does not use the label. -}; - const int kXkbAutoRepeatDelayInMs = 500; const int kXkbAutoRepeatIntervalInMs = 50; const char kPreferredKeyboardLayout[] = "PreferredKeyboardLayout"; diff --git a/chrome/browser/chromeos/language_preferences.h b/chrome/browser/chromeos/language_preferences.h index efd75be..16ef9c1 100644 --- a/chrome/browser/chromeos/language_preferences.h +++ b/chrome/browser/chromeos/language_preferences.h @@ -8,6 +8,8 @@ #include <stddef.h> // For size_t +#include "chrome/browser/prefs/pref_service.h" + // This file defines types and declare variables used in "Languages and // Input" settings in Chromium OS. namespace chromeos { @@ -27,6 +29,7 @@ struct LanguageMultipleChoicePreference { int item_message_id; // Resource grd ID for the combobox item. } values_and_ids[kMaxItems]; int label_message_id; // Resource grd ID for the label. + PrefService::PrefSyncStatus sync_status; }; // The struct is used for preferences of boolean values, like switches to @@ -36,6 +39,7 @@ struct LanguageBooleanPrefs { bool default_pref_value; const char* ibus_config_name; int message_id; + PrefService::PrefSyncStatus sync_status; }; // The struct is used for preferences of integer range values, like the @@ -47,6 +51,7 @@ struct LanguageIntegerRangePreference { int max_pref_value; const char* ibus_config_name; int message_id; + PrefService::PrefSyncStatus sync_status; }; // --------------------------------------------------------------------------- @@ -61,7 +66,7 @@ extern const char kHotkeyNextEngineInMenu[]; extern const char kHotkeyPreviousEngine[]; // --------------------------------------------------------------------------- -// For Traditional Chinese input method (ibus-chewing) +// For Traditional Chinese input method (ibus-mozc-chewing) // --------------------------------------------------------------------------- extern const char kChewingSectionName[]; @@ -116,6 +121,7 @@ struct PinyinIntegerPref { const char* pref_name; // Chrome preference name. int default_pref_value; const char* ibus_config_name; + PrefService::PrefSyncStatus sync_status; // TODO(yusukes): Add message_id if needed. }; @@ -143,17 +149,6 @@ const size_t kNumMozcIntegerPrefs = 1; // --------------------------------------------------------------------------- // For keyboard stuff // --------------------------------------------------------------------------- -// TODO(yusukes): Temporary solution for View version of modifier key remapper. -// Remove RemapType and kXkbModifierMultipleChoicePrefs when we finish to -// migrate to WebUI. -enum RemapType { - kNoRemap = 0, - kSwapCtrlAndAlt = 1, - kSwapSearchAndCtrl = 2, -}; -extern const LanguageMultipleChoicePreference<int> - kXkbModifierMultipleChoicePrefs; - // A delay between the first and the start of the rest. extern const int kXkbAutoRepeatDelayInMs; // An interval between the repeated keys. diff --git a/chrome/browser/chromeos/language_preferences_unittest.cc b/chrome/browser/chromeos/language_preferences_unittest.cc index 2383a28..36862b3 100644 --- a/chrome/browser/chromeos/language_preferences_unittest.cc +++ b/chrome/browser/chromeos/language_preferences_unittest.cc @@ -102,8 +102,6 @@ TEST(LanguagePreferencesTest, TestDefaultValuesOfMultipleChoicePrefs) { EXPECT_TRUE(CheckDefaultValueOfMultipleChoicePrefs( kChewingMultipleChoicePrefs, kNumChewingMultipleChoicePrefs)); EXPECT_TRUE(CheckDefaultValueOfMultipleChoicePrefs( - &kXkbModifierMultipleChoicePrefs, 1)); - EXPECT_TRUE(CheckDefaultValueOfMultipleChoicePrefs( &kChewingHsuSelKeyType, 1)); EXPECT_TRUE(CheckDefaultValueOfMultipleChoicePrefs( &kPinyinDoublePinyinSchema, 1)); @@ -117,8 +115,6 @@ TEST(LanguagePreferencesTest, TestDuplicationOfMultipleChoicePrefs) { EXPECT_TRUE(CheckDuplicationOfMultipleChoicePrefs( kChewingMultipleChoicePrefs, kNumChewingMultipleChoicePrefs)); EXPECT_TRUE(CheckDuplicationOfMultipleChoicePrefs( - &kXkbModifierMultipleChoicePrefs, 1)); - EXPECT_TRUE(CheckDuplicationOfMultipleChoicePrefs( &kChewingHsuSelKeyType, 1)); EXPECT_TRUE(CheckDuplicationOfMultipleChoicePrefs( &kPinyinDoublePinyinSchema, 1)); diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index f19082b..c546a3b 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -104,18 +104,19 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) { PrefService::SYNCABLE_PREF); prefs->RegisterStringPref(prefs::kLanguageHangulHanjaKeys, language_prefs::kHangulHanjaKeys, + // Don't sync the pref as it's not user-configurable PrefService::UNSYNCABLE_PREF); for (size_t i = 0; i < language_prefs::kNumPinyinBooleanPrefs; ++i) { prefs->RegisterBooleanPref( language_prefs::kPinyinBooleanPrefs[i].pref_name, language_prefs::kPinyinBooleanPrefs[i].default_pref_value, - PrefService::UNSYNCABLE_PREF); + language_prefs::kPinyinBooleanPrefs[i].sync_status); } for (size_t i = 0; i < language_prefs::kNumPinyinIntegerPrefs; ++i) { prefs->RegisterIntegerPref( language_prefs::kPinyinIntegerPrefs[i].pref_name, language_prefs::kPinyinIntegerPrefs[i].default_pref_value, - PrefService::UNSYNCABLE_PREF); + language_prefs::kPinyinIntegerPrefs[i].sync_status); } prefs->RegisterIntegerPref( language_prefs::kPinyinDoublePinyinSchema.pref_name, @@ -126,19 +127,19 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) { prefs->RegisterBooleanPref( language_prefs::kMozcBooleanPrefs[i].pref_name, language_prefs::kMozcBooleanPrefs[i].default_pref_value, - PrefService::UNSYNCABLE_PREF); + language_prefs::kMozcBooleanPrefs[i].sync_status); } for (size_t i = 0; i < language_prefs::kNumMozcMultipleChoicePrefs; ++i) { prefs->RegisterStringPref( language_prefs::kMozcMultipleChoicePrefs[i].pref_name, language_prefs::kMozcMultipleChoicePrefs[i].default_pref_value, - PrefService::UNSYNCABLE_PREF); + language_prefs::kMozcMultipleChoicePrefs[i].sync_status); } for (size_t i = 0; i < language_prefs::kNumMozcIntegerPrefs; ++i) { prefs->RegisterIntegerPref( language_prefs::kMozcIntegerPrefs[i].pref_name, language_prefs::kMozcIntegerPrefs[i].default_pref_value, - PrefService::UNSYNCABLE_PREF); + language_prefs::kMozcIntegerPrefs[i].sync_status); } prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapSearchKeyTo, input_method::kSearchKey, |