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

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

Issue 11550010: Remove partial magnifier from settings page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use a boolean pref instead of string pref. Created 8 years 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 if (prefs->FindPreference(prefs::kSpokenFeedbackEnabled) == NULL) { 97 if (prefs->FindPreference(prefs::kSpokenFeedbackEnabled) == NULL) {
98 prefs->RegisterBooleanPref(prefs::kSpokenFeedbackEnabled, 98 prefs->RegisterBooleanPref(prefs::kSpokenFeedbackEnabled,
99 false, 99 false,
100 PrefService::UNSYNCABLE_PREF); 100 PrefService::UNSYNCABLE_PREF);
101 } 101 }
102 if (prefs->FindPreference(prefs::kHighContrastEnabled) == NULL) { 102 if (prefs->FindPreference(prefs::kHighContrastEnabled) == NULL) {
103 prefs->RegisterBooleanPref(prefs::kHighContrastEnabled, 103 prefs->RegisterBooleanPref(prefs::kHighContrastEnabled,
104 false, 104 false,
105 PrefService::UNSYNCABLE_PREF); 105 PrefService::UNSYNCABLE_PREF);
106 } 106 }
107 if (prefs->FindPreference(prefs::kScreenMagnifierEnabled) == NULL) {
108 prefs->RegisterBooleanPref(prefs::kScreenMagnifierEnabled,
109 false,
110 PrefService::SYNCABLE_PREF);
111 }
107 if (prefs->FindPreference(prefs::kScreenMagnifierScale) == NULL) { 112 if (prefs->FindPreference(prefs::kScreenMagnifierScale) == NULL) {
108 prefs->RegisterDoublePref(prefs::kScreenMagnifierScale, 113 prefs->RegisterDoublePref(prefs::kScreenMagnifierScale,
109 std::numeric_limits<double>::min(), 114 std::numeric_limits<double>::min(),
110 PrefService::UNSYNCABLE_PREF); 115 PrefService::UNSYNCABLE_PREF);
111 } 116 }
112 if (prefs->FindPreference(prefs::kMagnifierType) == NULL) {
113 prefs->RegisterStringPref(prefs::kMagnifierType,
114 "",
115 PrefService::SYNCABLE_PREF);
116 }
117 if (prefs->FindPreference(prefs::kShouldAlwaysShowAccessibilityMenu) == 117 if (prefs->FindPreference(prefs::kShouldAlwaysShowAccessibilityMenu) ==
118 NULL) { 118 NULL) {
119 prefs->RegisterBooleanPref(prefs::kShouldAlwaysShowAccessibilityMenu, 119 prefs->RegisterBooleanPref(prefs::kShouldAlwaysShowAccessibilityMenu,
120 false, 120 false,
121 PrefService::UNSYNCABLE_PREF); 121 PrefService::UNSYNCABLE_PREF);
122 } 122 }
123 if (prefs->FindPreference(prefs::kVirtualKeyboardEnabled) == NULL) { 123 if (prefs->FindPreference(prefs::kVirtualKeyboardEnabled) == NULL) {
124 prefs->RegisterBooleanPref(prefs::kVirtualKeyboardEnabled, 124 prefs->RegisterBooleanPref(prefs::kVirtualKeyboardEnabled,
125 false, 125 false,
126 PrefService::UNSYNCABLE_PREF); 126 PrefService::UNSYNCABLE_PREF);
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 base::Bind(&Preferences::OnPreferenceChanged, base::Unretained(this)); 300 base::Bind(&Preferences::OnPreferenceChanged, base::Unretained(this));
301 301
302 tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, callback); 302 tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, callback);
303 tap_dragging_enabled_.Init(prefs::kTapDraggingEnabled, prefs, callback); 303 tap_dragging_enabled_.Init(prefs::kTapDraggingEnabled, prefs, callback);
304 three_finger_click_enabled_.Init(prefs::kEnableTouchpadThreeFingerClick, 304 three_finger_click_enabled_.Init(prefs::kEnableTouchpadThreeFingerClick,
305 prefs, callback); 305 prefs, callback);
306 three_finger_swipe_enabled_.Init(prefs::kEnableTouchpadThreeFingerSwipe, 306 three_finger_swipe_enabled_.Init(prefs::kEnableTouchpadThreeFingerSwipe,
307 prefs, callback); 307 prefs, callback);
308 natural_scroll_.Init(prefs::kNaturalScroll, prefs, callback); 308 natural_scroll_.Init(prefs::kNaturalScroll, prefs, callback);
309 accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled, prefs, callback); 309 accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled, prefs, callback);
310 screen_magnifier_type_.Init(prefs::kMagnifierType, prefs, callback); 310 screen_magnifier_enabled_.Init(prefs::kScreenMagnifierEnabled,
311 prefs, callback);
311 screen_magnifier_scale_.Init(prefs::kScreenMagnifierScale, prefs, callback); 312 screen_magnifier_scale_.Init(prefs::kScreenMagnifierScale, prefs, callback);
312 mouse_sensitivity_.Init(prefs::kMouseSensitivity, prefs, callback); 313 mouse_sensitivity_.Init(prefs::kMouseSensitivity, prefs, callback);
313 touchpad_sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, callback); 314 touchpad_sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, callback);
314 use_24hour_clock_.Init(prefs::kUse24HourClock, prefs, callback); 315 use_24hour_clock_.Init(prefs::kUse24HourClock, prefs, callback);
315 disable_drive_.Init(prefs::kDisableDrive, prefs, callback); 316 disable_drive_.Init(prefs::kDisableDrive, prefs, callback);
316 disable_drive_over_cellular_.Init(prefs::kDisableDriveOverCellular, 317 disable_drive_over_cellular_.Init(prefs::kDisableDriveOverCellular,
317 prefs, callback); 318 prefs, callback);
318 disable_drive_hosted_files_.Init(prefs::kDisableDriveHostedFiles, 319 disable_drive_hosted_files_.Init(prefs::kDisableDriveHostedFiles,
319 prefs, callback); 320 prefs, callback);
320 download_default_directory_.Init(prefs::kDownloadDefaultDirectory, 321 download_default_directory_.Init(prefs::kDownloadDefaultDirectory,
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
767 768
768 input_method::AutoRepeatRate rate; 769 input_method::AutoRepeatRate rate;
769 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue(); 770 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue();
770 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue(); 771 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue();
771 DCHECK(rate.initial_delay_in_ms > 0); 772 DCHECK(rate.initial_delay_in_ms > 0);
772 DCHECK(rate.repeat_interval_in_ms > 0); 773 DCHECK(rate.repeat_interval_in_ms > 0);
773 input_method::XKeyboard::SetAutoRepeatRate(rate); 774 input_method::XKeyboard::SetAutoRepeatRate(rate);
774 } 775 }
775 776
776 } // namespace chromeos 777 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/preferences.h ('k') | chrome/browser/resources/options/browser_options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698