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

Unified Diff: chrome/browser/chromeos/preferences.cc

Issue 11194011: Reverting this CL because it was committed before I gave the final LGTM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/preferences.h ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/preferences.cc
===================================================================
--- chrome/browser/chromeos/preferences.cc (revision 162209)
+++ chrome/browser/chromeos/preferences.cc (working copy)
@@ -97,12 +97,16 @@
false,
PrefService::UNSYNCABLE_PREF);
}
- prefs->RegisterBooleanPref(prefs::kScreenMagnifierEnabled,
- false,
- PrefService::UNSYNCABLE_PREF);
- prefs->RegisterDoublePref(prefs::kScreenMagnifierScale,
- std::numeric_limits<double>::min(),
- PrefService::UNSYNCABLE_PREF);
+ if (prefs->FindPreference(prefs::kScreenMagnifierEnabled) == NULL) {
+ prefs->RegisterBooleanPref(prefs::kScreenMagnifierEnabled,
+ false,
+ PrefService::UNSYNCABLE_PREF);
+ }
+ if (prefs->FindPreference(prefs::kScreenMagnifierScale) == NULL) {
+ prefs->RegisterDoublePref(prefs::kScreenMagnifierScale,
+ std::numeric_limits<double>::min(),
+ PrefService::UNSYNCABLE_PREF);
+ }
if (prefs->FindPreference(prefs::kVirtualKeyboardEnabled) == NULL) {
prefs->RegisterBooleanPref(prefs::kVirtualKeyboardEnabled,
false,
@@ -283,8 +287,6 @@
prefs, this);
natural_scroll_.Init(prefs::kNaturalScroll, prefs, this);
accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled, prefs, this);
- screen_magnifier_enabled_.Init(prefs::kScreenMagnifierEnabled, prefs, this);
- screen_magnifier_scale_.Init(prefs::kScreenMagnifierScale, prefs, this);
mouse_sensitivity_.Init(prefs::kMouseSensitivity, prefs, this);
touchpad_sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, this);
use_24hour_clock_.Init(prefs::kUse24HourClock, prefs, this);
« no previous file with comments | « chrome/browser/chromeos/preferences.h ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698