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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chromeos/chromeos_version.h" 7 #include "base/chromeos/chromeos_version.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/i18n/time_formatting.h" 9 #include "base/i18n/time_formatting.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 if (prefs->FindPreference(prefs::kSpokenFeedbackEnabled) == NULL) { 90 if (prefs->FindPreference(prefs::kSpokenFeedbackEnabled) == NULL) {
91 prefs->RegisterBooleanPref(prefs::kSpokenFeedbackEnabled, 91 prefs->RegisterBooleanPref(prefs::kSpokenFeedbackEnabled,
92 false, 92 false,
93 PrefService::UNSYNCABLE_PREF); 93 PrefService::UNSYNCABLE_PREF);
94 } 94 }
95 if (prefs->FindPreference(prefs::kHighContrastEnabled) == NULL) { 95 if (prefs->FindPreference(prefs::kHighContrastEnabled) == NULL) {
96 prefs->RegisterBooleanPref(prefs::kHighContrastEnabled, 96 prefs->RegisterBooleanPref(prefs::kHighContrastEnabled,
97 false, 97 false,
98 PrefService::UNSYNCABLE_PREF); 98 PrefService::UNSYNCABLE_PREF);
99 } 99 }
100 prefs->RegisterBooleanPref(prefs::kScreenMagnifierEnabled, 100 if (prefs->FindPreference(prefs::kScreenMagnifierEnabled) == NULL) {
101 false, 101 prefs->RegisterBooleanPref(prefs::kScreenMagnifierEnabled,
102 PrefService::UNSYNCABLE_PREF); 102 false,
103 prefs->RegisterDoublePref(prefs::kScreenMagnifierScale, 103 PrefService::UNSYNCABLE_PREF);
104 std::numeric_limits<double>::min(), 104 }
105 PrefService::UNSYNCABLE_PREF); 105 if (prefs->FindPreference(prefs::kScreenMagnifierScale) == NULL) {
106 prefs->RegisterDoublePref(prefs::kScreenMagnifierScale,
107 std::numeric_limits<double>::min(),
108 PrefService::UNSYNCABLE_PREF);
109 }
106 if (prefs->FindPreference(prefs::kVirtualKeyboardEnabled) == NULL) { 110 if (prefs->FindPreference(prefs::kVirtualKeyboardEnabled) == NULL) {
107 prefs->RegisterBooleanPref(prefs::kVirtualKeyboardEnabled, 111 prefs->RegisterBooleanPref(prefs::kVirtualKeyboardEnabled,
108 false, 112 false,
109 PrefService::UNSYNCABLE_PREF); 113 PrefService::UNSYNCABLE_PREF);
110 } 114 }
111 prefs->RegisterIntegerPref(prefs::kMouseSensitivity, 115 prefs->RegisterIntegerPref(prefs::kMouseSensitivity,
112 3, 116 3,
113 PrefService::UNSYNCABLE_PREF); 117 PrefService::UNSYNCABLE_PREF);
114 prefs->RegisterIntegerPref(prefs::kTouchpadSensitivity, 118 prefs->RegisterIntegerPref(prefs::kTouchpadSensitivity,
115 3, 119 3,
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 } 280 }
277 281
278 void Preferences::InitUserPrefs(PrefService* prefs) { 282 void Preferences::InitUserPrefs(PrefService* prefs) {
279 prefs_ = prefs; 283 prefs_ = prefs;
280 284
281 tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, this); 285 tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, this);
282 three_finger_click_enabled_.Init(prefs::kEnableTouchpadThreeFingerClick, 286 three_finger_click_enabled_.Init(prefs::kEnableTouchpadThreeFingerClick,
283 prefs, this); 287 prefs, this);
284 natural_scroll_.Init(prefs::kNaturalScroll, prefs, this); 288 natural_scroll_.Init(prefs::kNaturalScroll, prefs, this);
285 accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled, prefs, this); 289 accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled, prefs, this);
286 screen_magnifier_enabled_.Init(prefs::kScreenMagnifierEnabled, prefs, this);
287 screen_magnifier_scale_.Init(prefs::kScreenMagnifierScale, prefs, this);
288 mouse_sensitivity_.Init(prefs::kMouseSensitivity, prefs, this); 290 mouse_sensitivity_.Init(prefs::kMouseSensitivity, prefs, this);
289 touchpad_sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, this); 291 touchpad_sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, this);
290 use_24hour_clock_.Init(prefs::kUse24HourClock, prefs, this); 292 use_24hour_clock_.Init(prefs::kUse24HourClock, prefs, this);
291 disable_drive_.Init(prefs::kDisableGData, prefs, this); 293 disable_drive_.Init(prefs::kDisableGData, prefs, this);
292 disable_drive_over_cellular_.Init(prefs::kDisableGDataOverCellular, 294 disable_drive_over_cellular_.Init(prefs::kDisableGDataOverCellular,
293 prefs, this); 295 prefs, this);
294 disable_drive_hosted_files_.Init(prefs::kDisableGDataHostedFiles, 296 disable_drive_hosted_files_.Init(prefs::kDisableGDataHostedFiles,
295 prefs, this); 297 prefs, this);
296 download_default_directory_.Init(prefs::kDownloadDefaultDirectory, 298 download_default_directory_.Init(prefs::kDownloadDefaultDirectory,
297 prefs, this); 299 prefs, this);
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 731
730 input_method::AutoRepeatRate rate; 732 input_method::AutoRepeatRate rate;
731 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue(); 733 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue();
732 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue(); 734 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue();
733 DCHECK(rate.initial_delay_in_ms > 0); 735 DCHECK(rate.initial_delay_in_ms > 0);
734 DCHECK(rate.repeat_interval_in_ms > 0); 736 DCHECK(rate.repeat_interval_in_ms > 0);
735 input_method::XKeyboard::SetAutoRepeatRate(rate); 737 input_method::XKeyboard::SetAutoRepeatRate(rate);
736 } 738 }
737 739
738 } // namespace chromeos 740 } // namespace chromeos
OLDNEW
« 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