OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/preferences.h" | 5 #include "chrome/browser/chromeos/preferences.h" |
6 | 6 |
7 #include "base/i18n/time_formatting.h" | 7 #include "base/i18n/time_formatting.h" |
8 #include "base/metrics/histogram.h" | 8 #include "base/metrics/histogram.h" |
9 #include "base/string_split.h" | 9 #include "base/string_split.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
50 prefs->RegisterBooleanPref(prefs::kAccessibilityEnabled, | 50 prefs->RegisterBooleanPref(prefs::kAccessibilityEnabled, |
51 false, | 51 false, |
52 PrefService::UNSYNCABLE_PREF); | 52 PrefService::UNSYNCABLE_PREF); |
53 } | 53 } |
54 prefs->RegisterIntegerPref(prefs::kTouchpadSensitivity, | 54 prefs->RegisterIntegerPref(prefs::kTouchpadSensitivity, |
55 3, | 55 3, |
56 PrefService::UNSYNCABLE_PREF); | 56 PrefService::UNSYNCABLE_PREF); |
57 prefs->RegisterBooleanPref(prefs::kUse24HourClock, | 57 prefs->RegisterBooleanPref(prefs::kUse24HourClock, |
58 base::GetHourClockType() == base::k24HourClock, | 58 base::GetHourClockType() == base::k24HourClock, |
59 PrefService::SYNCABLE_PREF); | 59 PrefService::SYNCABLE_PREF); |
60 // 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.
| |
60 prefs->RegisterStringPref(prefs::kLanguageCurrentInputMethod, | 61 prefs->RegisterStringPref(prefs::kLanguageCurrentInputMethod, |
61 "", | 62 "", |
62 PrefService::UNSYNCABLE_PREF); | 63 PrefService::UNSYNCABLE_PREF); |
63 prefs->RegisterStringPref(prefs::kLanguagePreviousInputMethod, | 64 prefs->RegisterStringPref(prefs::kLanguagePreviousInputMethod, |
64 "", | 65 "", |
65 PrefService::UNSYNCABLE_PREF); | 66 PrefService::UNSYNCABLE_PREF); |
67 // We don't sync input method hotkeys since they're not configurable. | |
66 prefs->RegisterStringPref(prefs::kLanguageHotkeyNextEngineInMenu, | 68 prefs->RegisterStringPref(prefs::kLanguageHotkeyNextEngineInMenu, |
67 language_prefs::kHotkeyNextEngineInMenu, | 69 language_prefs::kHotkeyNextEngineInMenu, |
68 PrefService::UNSYNCABLE_PREF); | 70 PrefService::UNSYNCABLE_PREF); |
69 prefs->RegisterStringPref(prefs::kLanguageHotkeyPreviousEngine, | 71 prefs->RegisterStringPref(prefs::kLanguageHotkeyPreviousEngine, |
70 language_prefs::kHotkeyPreviousEngine, | 72 language_prefs::kHotkeyPreviousEngine, |
71 PrefService::UNSYNCABLE_PREF); | 73 PrefService::UNSYNCABLE_PREF); |
74 // We don't sync the list of input methods and preferred languages since a | |
75 // user might use two or more devices with different hardware keyboards. | |
76 // crosbug.com/15181 | |
72 prefs->RegisterStringPref(prefs::kLanguagePreferredLanguages, | 77 prefs->RegisterStringPref(prefs::kLanguagePreferredLanguages, |
73 kFallbackInputMethodLocale, | 78 kFallbackInputMethodLocale, |
74 PrefService::SYNCABLE_PREF); | 79 PrefService::UNSYNCABLE_PREF); |
75 prefs->RegisterStringPref(prefs::kLanguagePreloadEngines, | 80 prefs->RegisterStringPref(prefs::kLanguagePreloadEngines, |
76 input_method::GetHardwareInputMethodId(), | 81 input_method::GetHardwareInputMethodId(), |
77 PrefService::SYNCABLE_PREF); | 82 PrefService::UNSYNCABLE_PREF); |
78 for (size_t i = 0; i < language_prefs::kNumChewingBooleanPrefs; ++i) { | 83 for (size_t i = 0; i < language_prefs::kNumChewingBooleanPrefs; ++i) { |
79 prefs->RegisterBooleanPref( | 84 prefs->RegisterBooleanPref( |
80 language_prefs::kChewingBooleanPrefs[i].pref_name, | 85 language_prefs::kChewingBooleanPrefs[i].pref_name, |
81 language_prefs::kChewingBooleanPrefs[i].default_pref_value, | 86 language_prefs::kChewingBooleanPrefs[i].default_pref_value, |
82 PrefService::UNSYNCABLE_PREF); | 87 PrefService::UNSYNCABLE_PREF); |
83 } | 88 } |
84 for (size_t i = 0; i < language_prefs::kNumChewingMultipleChoicePrefs; ++i) { | 89 for (size_t i = 0; i < language_prefs::kNumChewingMultipleChoicePrefs; ++i) { |
85 prefs->RegisterStringPref( | 90 prefs->RegisterStringPref( |
86 language_prefs::kChewingMultipleChoicePrefs[i].pref_name, | 91 language_prefs::kChewingMultipleChoicePrefs[i].pref_name, |
87 language_prefs::kChewingMultipleChoicePrefs[i].default_pref_value, | 92 language_prefs::kChewingMultipleChoicePrefs[i].default_pref_value, |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
142 } | 147 } |
143 prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapSearchKeyTo, | 148 prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapSearchKeyTo, |
144 input_method::kSearchKey, | 149 input_method::kSearchKey, |
145 PrefService::SYNCABLE_PREF); | 150 PrefService::SYNCABLE_PREF); |
146 prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapControlKeyTo, | 151 prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapControlKeyTo, |
147 input_method::kLeftControlKey, | 152 input_method::kLeftControlKey, |
148 PrefService::SYNCABLE_PREF); | 153 PrefService::SYNCABLE_PREF); |
149 prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapAltKeyTo, | 154 prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapAltKeyTo, |
150 input_method::kLeftAltKey, | 155 input_method::kLeftAltKey, |
151 PrefService::SYNCABLE_PREF); | 156 PrefService::SYNCABLE_PREF); |
157 // We don't sync the following keyboard prefs since they are not user- | |
158 // configurable. | |
152 prefs->RegisterBooleanPref(prefs::kLanguageXkbAutoRepeatEnabled, | 159 prefs->RegisterBooleanPref(prefs::kLanguageXkbAutoRepeatEnabled, |
153 true, | 160 true, |
154 PrefService::UNSYNCABLE_PREF); | 161 PrefService::UNSYNCABLE_PREF); |
155 prefs->RegisterIntegerPref(prefs::kLanguageXkbAutoRepeatDelay, | 162 prefs->RegisterIntegerPref(prefs::kLanguageXkbAutoRepeatDelay, |
156 language_prefs::kXkbAutoRepeatDelayInMs, | 163 language_prefs::kXkbAutoRepeatDelayInMs, |
157 PrefService::UNSYNCABLE_PREF); | 164 PrefService::UNSYNCABLE_PREF); |
158 prefs->RegisterIntegerPref(prefs::kLanguageXkbAutoRepeatInterval, | 165 prefs->RegisterIntegerPref(prefs::kLanguageXkbAutoRepeatInterval, |
159 language_prefs::kXkbAutoRepeatIntervalInMs, | 166 language_prefs::kXkbAutoRepeatIntervalInMs, |
160 PrefService::UNSYNCABLE_PREF); | 167 PrefService::UNSYNCABLE_PREF); |
161 | 168 |
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
527 input_method::AutoRepeatRate rate; | 534 input_method::AutoRepeatRate rate; |
528 rate.initial_delay_in_ms = language_xkb_auto_repeat_delay_pref_.GetValue(); | 535 rate.initial_delay_in_ms = language_xkb_auto_repeat_delay_pref_.GetValue(); |
529 rate.repeat_interval_in_ms = | 536 rate.repeat_interval_in_ms = |
530 language_xkb_auto_repeat_interval_pref_.GetValue(); | 537 language_xkb_auto_repeat_interval_pref_.GetValue(); |
531 DCHECK(rate.initial_delay_in_ms > 0); | 538 DCHECK(rate.initial_delay_in_ms > 0); |
532 DCHECK(rate.repeat_interval_in_ms > 0); | 539 DCHECK(rate.repeat_interval_in_ms > 0); |
533 input_method::SetAutoRepeatRate(rate); | 540 input_method::SetAutoRepeatRate(rate); |
534 } | 541 } |
535 | 542 |
536 } // namespace chromeos | 543 } // namespace chromeos |
OLD | NEW |