| Index: chrome/browser/chromeos/preferences.cc
|
| diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
|
| index af941d5e10ed939c38775ca5bd740e6eee543b74..d8f4ec335fad0954d35684b7f3701e5dd72f645f 100644
|
| --- a/chrome/browser/chromeos/preferences.cc
|
| +++ b/chrome/browser/chromeos/preferences.cc
|
| @@ -104,16 +104,16 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) {
|
| false,
|
| PrefService::UNSYNCABLE_PREF);
|
| }
|
| + if (prefs->FindPreference(prefs::kScreenMagnifierEnabled) == NULL) {
|
| + prefs->RegisterBooleanPref(prefs::kScreenMagnifierEnabled,
|
| + false,
|
| + PrefService::SYNCABLE_PREF);
|
| + }
|
| if (prefs->FindPreference(prefs::kScreenMagnifierScale) == NULL) {
|
| prefs->RegisterDoublePref(prefs::kScreenMagnifierScale,
|
| std::numeric_limits<double>::min(),
|
| PrefService::UNSYNCABLE_PREF);
|
| }
|
| - if (prefs->FindPreference(prefs::kMagnifierType) == NULL) {
|
| - prefs->RegisterStringPref(prefs::kMagnifierType,
|
| - "",
|
| - PrefService::SYNCABLE_PREF);
|
| - }
|
| if (prefs->FindPreference(prefs::kShouldAlwaysShowAccessibilityMenu) ==
|
| NULL) {
|
| prefs->RegisterBooleanPref(prefs::kShouldAlwaysShowAccessibilityMenu,
|
| @@ -307,7 +307,8 @@ void Preferences::InitUserPrefs(PrefService* prefs) {
|
| prefs, callback);
|
| natural_scroll_.Init(prefs::kNaturalScroll, prefs, callback);
|
| accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled, prefs, callback);
|
| - screen_magnifier_type_.Init(prefs::kMagnifierType, prefs, callback);
|
| + screen_magnifier_enabled_.Init(prefs::kScreenMagnifierEnabled,
|
| + prefs, callback);
|
| screen_magnifier_scale_.Init(prefs::kScreenMagnifierScale, prefs, callback);
|
| mouse_sensitivity_.Init(prefs::kMouseSensitivity, prefs, callback);
|
| touchpad_sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, callback);
|
|
|