Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(505)

Side by Side Diff: chrome/browser/chromeos/preferences.cc

Issue 7013051: Do not sync prefs::kLanguagePreloadEngines and prefs::kLanguagePreferredLanguages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review fix Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
61 // because they're just used to track the logout state of the device.
60 prefs->RegisterStringPref(prefs::kLanguageCurrentInputMethod, 62 prefs->RegisterStringPref(prefs::kLanguageCurrentInputMethod,
61 "", 63 "",
62 PrefService::UNSYNCABLE_PREF); 64 PrefService::UNSYNCABLE_PREF);
63 prefs->RegisterStringPref(prefs::kLanguagePreviousInputMethod, 65 prefs->RegisterStringPref(prefs::kLanguagePreviousInputMethod,
64 "", 66 "",
65 PrefService::UNSYNCABLE_PREF); 67 PrefService::UNSYNCABLE_PREF);
68 // We don't sync input method hotkeys since they're not configurable.
66 prefs->RegisterStringPref(prefs::kLanguageHotkeyNextEngineInMenu, 69 prefs->RegisterStringPref(prefs::kLanguageHotkeyNextEngineInMenu,
67 language_prefs::kHotkeyNextEngineInMenu, 70 language_prefs::kHotkeyNextEngineInMenu,
68 PrefService::UNSYNCABLE_PREF); 71 PrefService::UNSYNCABLE_PREF);
69 prefs->RegisterStringPref(prefs::kLanguageHotkeyPreviousEngine, 72 prefs->RegisterStringPref(prefs::kLanguageHotkeyPreviousEngine,
70 language_prefs::kHotkeyPreviousEngine, 73 language_prefs::kHotkeyPreviousEngine,
71 PrefService::UNSYNCABLE_PREF); 74 PrefService::UNSYNCABLE_PREF);
75 // We don't sync the list of input methods and preferred languages since a
76 // user might use two or more devices with different hardware keyboards.
77 // crosbug.com/15181
72 prefs->RegisterStringPref(prefs::kLanguagePreferredLanguages, 78 prefs->RegisterStringPref(prefs::kLanguagePreferredLanguages,
73 kFallbackInputMethodLocale, 79 kFallbackInputMethodLocale,
74 PrefService::SYNCABLE_PREF); 80 PrefService::UNSYNCABLE_PREF);
75 prefs->RegisterStringPref(prefs::kLanguagePreloadEngines, 81 prefs->RegisterStringPref(prefs::kLanguagePreloadEngines,
76 input_method::GetHardwareInputMethodId(), 82 input_method::GetHardwareInputMethodId(),
77 PrefService::SYNCABLE_PREF); 83 PrefService::UNSYNCABLE_PREF);
78 for (size_t i = 0; i < language_prefs::kNumChewingBooleanPrefs; ++i) { 84 for (size_t i = 0; i < language_prefs::kNumChewingBooleanPrefs; ++i) {
79 prefs->RegisterBooleanPref( 85 prefs->RegisterBooleanPref(
80 language_prefs::kChewingBooleanPrefs[i].pref_name, 86 language_prefs::kChewingBooleanPrefs[i].pref_name,
81 language_prefs::kChewingBooleanPrefs[i].default_pref_value, 87 language_prefs::kChewingBooleanPrefs[i].default_pref_value,
82 PrefService::UNSYNCABLE_PREF); 88 PrefService::UNSYNCABLE_PREF);
83 } 89 }
84 for (size_t i = 0; i < language_prefs::kNumChewingMultipleChoicePrefs; ++i) { 90 for (size_t i = 0; i < language_prefs::kNumChewingMultipleChoicePrefs; ++i) {
85 prefs->RegisterStringPref( 91 prefs->RegisterStringPref(
86 language_prefs::kChewingMultipleChoicePrefs[i].pref_name, 92 language_prefs::kChewingMultipleChoicePrefs[i].pref_name,
87 language_prefs::kChewingMultipleChoicePrefs[i].default_pref_value, 93 language_prefs::kChewingMultipleChoicePrefs[i].default_pref_value,
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 } 148 }
143 prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapSearchKeyTo, 149 prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapSearchKeyTo,
144 input_method::kSearchKey, 150 input_method::kSearchKey,
145 PrefService::SYNCABLE_PREF); 151 PrefService::SYNCABLE_PREF);
146 prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapControlKeyTo, 152 prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapControlKeyTo,
147 input_method::kLeftControlKey, 153 input_method::kLeftControlKey,
148 PrefService::SYNCABLE_PREF); 154 PrefService::SYNCABLE_PREF);
149 prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapAltKeyTo, 155 prefs->RegisterIntegerPref(prefs::kLanguageXkbRemapAltKeyTo,
150 input_method::kLeftAltKey, 156 input_method::kLeftAltKey,
151 PrefService::SYNCABLE_PREF); 157 PrefService::SYNCABLE_PREF);
158 // We don't sync the following keyboard prefs since they are not user-
159 // configurable.
152 prefs->RegisterBooleanPref(prefs::kLanguageXkbAutoRepeatEnabled, 160 prefs->RegisterBooleanPref(prefs::kLanguageXkbAutoRepeatEnabled,
153 true, 161 true,
154 PrefService::UNSYNCABLE_PREF); 162 PrefService::UNSYNCABLE_PREF);
155 prefs->RegisterIntegerPref(prefs::kLanguageXkbAutoRepeatDelay, 163 prefs->RegisterIntegerPref(prefs::kLanguageXkbAutoRepeatDelay,
156 language_prefs::kXkbAutoRepeatDelayInMs, 164 language_prefs::kXkbAutoRepeatDelayInMs,
157 PrefService::UNSYNCABLE_PREF); 165 PrefService::UNSYNCABLE_PREF);
158 prefs->RegisterIntegerPref(prefs::kLanguageXkbAutoRepeatInterval, 166 prefs->RegisterIntegerPref(prefs::kLanguageXkbAutoRepeatInterval,
159 language_prefs::kXkbAutoRepeatIntervalInMs, 167 language_prefs::kXkbAutoRepeatIntervalInMs,
160 PrefService::UNSYNCABLE_PREF); 168 PrefService::UNSYNCABLE_PREF);
161 169
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 input_method::AutoRepeatRate rate; 535 input_method::AutoRepeatRate rate;
528 rate.initial_delay_in_ms = language_xkb_auto_repeat_delay_pref_.GetValue(); 536 rate.initial_delay_in_ms = language_xkb_auto_repeat_delay_pref_.GetValue();
529 rate.repeat_interval_in_ms = 537 rate.repeat_interval_in_ms =
530 language_xkb_auto_repeat_interval_pref_.GetValue(); 538 language_xkb_auto_repeat_interval_pref_.GetValue();
531 DCHECK(rate.initial_delay_in_ms > 0); 539 DCHECK(rate.initial_delay_in_ms > 0);
532 DCHECK(rate.repeat_interval_in_ms > 0); 540 DCHECK(rate.repeat_interval_in_ms > 0);
533 input_method::SetAutoRepeatRate(rate); 541 input_method::SetAutoRepeatRate(rate);
534 } 542 }
535 543
536 } // namespace chromeos 544 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698