Chromium Code Reviews| Index: chrome/browser/chromeos/preferences.cc |
| diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc |
| index f19082b36050d93a4421d1f8cd7be62149b167dd..c989d7b9d070679c492522b8ffc2d9643d5f4e4e 100644 |
| --- a/chrome/browser/chromeos/preferences.cc |
| +++ b/chrome/browser/chromeos/preferences.cc |
| @@ -57,24 +57,29 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) { |
| prefs->RegisterBooleanPref(prefs::kUse24HourClock, |
| base::GetHourClockType() == base::k24HourClock, |
| PrefService::SYNCABLE_PREF); |
| + // We don't sync prefs::kLanguageCurrentInputMethod and PreviousInputMethod. |
|
Zachary Kuznia
2011/05/16 01:50:31
nit: Could you add that we don't sync these becaus
Yusuke Sato
2011/05/16 06:23:43
Done.
|
| prefs->RegisterStringPref(prefs::kLanguageCurrentInputMethod, |
| "", |
| PrefService::UNSYNCABLE_PREF); |
| prefs->RegisterStringPref(prefs::kLanguagePreviousInputMethod, |
| "", |
| PrefService::UNSYNCABLE_PREF); |
| + // We don't sync input method hotkeys since they're not configurable. |
| prefs->RegisterStringPref(prefs::kLanguageHotkeyNextEngineInMenu, |
| language_prefs::kHotkeyNextEngineInMenu, |
| PrefService::UNSYNCABLE_PREF); |
| prefs->RegisterStringPref(prefs::kLanguageHotkeyPreviousEngine, |
| language_prefs::kHotkeyPreviousEngine, |
| PrefService::UNSYNCABLE_PREF); |
| + // We don't sync the list of input methods and preferred languages since a |
| + // user might use two or more devices with different hardware keyboards. |
| + // crosbug.com/15181 |
| prefs->RegisterStringPref(prefs::kLanguagePreferredLanguages, |
| kFallbackInputMethodLocale, |
| - PrefService::SYNCABLE_PREF); |
| + PrefService::UNSYNCABLE_PREF); |
| prefs->RegisterStringPref(prefs::kLanguagePreloadEngines, |
| input_method::GetHardwareInputMethodId(), |
| - PrefService::SYNCABLE_PREF); |
| + PrefService::UNSYNCABLE_PREF); |
| for (size_t i = 0; i < language_prefs::kNumChewingBooleanPrefs; ++i) { |
| prefs->RegisterBooleanPref( |
| language_prefs::kChewingBooleanPrefs[i].pref_name, |
| @@ -149,6 +154,8 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) { |
| prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapAltKeyTo, |
| input_method::kLeftAltKey, |
| PrefService::SYNCABLE_PREF); |
| + // We don't sync the following keyboard prefs since they are not user- |
| + // configurable. |
| prefs->RegisterBooleanPref(prefs::kLanguageXkbAutoRepeatEnabled, |
| true, |
| PrefService::UNSYNCABLE_PREF); |