| Index: chrome/browser/chromeos/preferences.cc
|
| diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
|
| index 9316186938dd0df9701de01bc7384cedb60d3d2b..8ee9f98d188e8394c784d53710c3b1a5c844cbd0 100644
|
| --- a/chrome/browser/chromeos/preferences.cc
|
| +++ b/chrome/browser/chromeos/preferences.cc
|
| @@ -93,9 +93,9 @@ void Preferences::RegisterUserPrefs(PrefServiceSyncable* prefs) {
|
| prefs->RegisterBooleanPref(prefs::kLabsAdvancedFilesystemEnabled,
|
| false,
|
| PrefServiceSyncable::UNSYNCABLE_PREF);
|
| - // Check if the accessibility pref is already registered, which can happen
|
| + // Check if the accessibility prefs are already registered, which can happen
|
| // in WizardController::RegisterPrefs. We still want to try to register
|
| - // the pref here in case of Chrome/Linux with ChromeOS=1.
|
| + // the prefs here in case of Chrome/Linux with ChromeOS=1.
|
| if (prefs->FindPreference(prefs::kSpokenFeedbackEnabled) == NULL) {
|
| prefs->RegisterBooleanPref(prefs::kSpokenFeedbackEnabled,
|
| false,
|
| @@ -106,27 +106,20 @@ void Preferences::RegisterUserPrefs(PrefServiceSyncable* prefs) {
|
| false,
|
| PrefServiceSyncable::UNSYNCABLE_PREF);
|
| }
|
| - if (prefs->FindPreference(prefs::kScreenMagnifierEnabled) == NULL) {
|
| - prefs->RegisterBooleanPref(prefs::kScreenMagnifierEnabled,
|
| - false,
|
| - PrefServiceSyncable::SYNCABLE_PREF);
|
| - }
|
| - if (prefs->FindPreference(prefs::kScreenMagnifierScale) == NULL) {
|
| - prefs->RegisterDoublePref(prefs::kScreenMagnifierScale,
|
| - std::numeric_limits<double>::min(),
|
| - PrefServiceSyncable::UNSYNCABLE_PREF);
|
| - }
|
| - if (prefs->FindPreference(prefs::kShouldAlwaysShowAccessibilityMenu) ==
|
| - NULL) {
|
| - prefs->RegisterBooleanPref(prefs::kShouldAlwaysShowAccessibilityMenu,
|
| - false,
|
| - PrefServiceSyncable::UNSYNCABLE_PREF);
|
| - }
|
| if (prefs->FindPreference(prefs::kVirtualKeyboardEnabled) == NULL) {
|
| prefs->RegisterBooleanPref(prefs::kVirtualKeyboardEnabled,
|
| false,
|
| PrefServiceSyncable::UNSYNCABLE_PREF);
|
| }
|
| + prefs->RegisterBooleanPref(prefs::kScreenMagnifierEnabled,
|
| + false,
|
| + PrefServiceSyncable::SYNCABLE_PREF);
|
| + prefs->RegisterDoublePref(prefs::kScreenMagnifierScale,
|
| + std::numeric_limits<double>::min(),
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| + prefs->RegisterBooleanPref(prefs::kShouldAlwaysShowAccessibilityMenu,
|
| + false,
|
| + PrefServiceSyncable::UNSYNCABLE_PREF);
|
| prefs->RegisterIntegerPref(prefs::kMouseSensitivity,
|
| 3,
|
| PrefServiceSyncable::SYNCABLE_PREF);
|
|
|