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

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

Issue 136633005: Turn back spoken feedback setting into a system-wide (non-per-user) preference (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 "ash/autoclick/autoclick_controller.h" 7 #include "ash/autoclick/autoclick_controller.h"
8 #include "ash/magnifier/magnifier_constants.h" 8 #include "ash/magnifier/magnifier_constants.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 // no need to remove this shell observer. 74 // no need to remove this shell observer.
75 if (ash::Shell::HasInstance()) 75 if (ash::Shell::HasInstance())
76 ash::Shell::GetInstance()->RemoveShellObserver(this); 76 ash::Shell::GetInstance()->RemoveShellObserver(this);
77 } 77 }
78 78
79 // static 79 // static
80 void Preferences::RegisterPrefs(PrefRegistrySimple* registry) { 80 void Preferences::RegisterPrefs(PrefRegistrySimple* registry) {
81 registry->RegisterBooleanPref(prefs::kOwnerPrimaryMouseButtonRight, false); 81 registry->RegisterBooleanPref(prefs::kOwnerPrimaryMouseButtonRight, false);
82 registry->RegisterBooleanPref(prefs::kOwnerTapToClickEnabled, true); 82 registry->RegisterBooleanPref(prefs::kOwnerTapToClickEnabled, true);
83 registry->RegisterBooleanPref(prefs::kVirtualKeyboardEnabled, false); 83 registry->RegisterBooleanPref(prefs::kVirtualKeyboardEnabled, false);
84 registry->RegisterBooleanPref(prefs::kSpokenFeedbackEnabled, false);
84 } 85 }
85 86
86 // static 87 // static
87 void Preferences::RegisterProfilePrefs( 88 void Preferences::RegisterProfilePrefs(
88 user_prefs::PrefRegistrySyncable* registry) { 89 user_prefs::PrefRegistrySyncable* registry) {
89 std::string hardware_keyboard_id; 90 std::string hardware_keyboard_id;
90 // TODO(yusukes): Remove the runtime hack. 91 // TODO(yusukes): Remove the runtime hack.
91 if (base::SysInfo::IsRunningOnChromeOS()) { 92 if (base::SysInfo::IsRunningOnChromeOS()) {
92 input_method::InputMethodManager* manager = 93 input_method::InputMethodManager* manager =
93 input_method::InputMethodManager::Get(); 94 input_method::InputMethodManager::Get();
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); 136 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
136 registry->RegisterBooleanPref( 137 registry->RegisterBooleanPref(
137 prefs::kStickyKeysEnabled, 138 prefs::kStickyKeysEnabled,
138 false, 139 false,
139 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 140 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
140 registry->RegisterBooleanPref( 141 registry->RegisterBooleanPref(
141 prefs::kLargeCursorEnabled, 142 prefs::kLargeCursorEnabled,
142 false, 143 false,
143 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 144 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
144 registry->RegisterBooleanPref( 145 registry->RegisterBooleanPref(
145 prefs::kSpokenFeedbackEnabled,
146 false,
147 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
148 registry->RegisterBooleanPref(
149 prefs::kHighContrastEnabled, 146 prefs::kHighContrastEnabled,
150 false, 147 false,
151 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 148 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
152 registry->RegisterBooleanPref( 149 registry->RegisterBooleanPref(
153 prefs::kScreenMagnifierEnabled, 150 prefs::kScreenMagnifierEnabled,
154 false, 151 false,
155 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 152 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
156 registry->RegisterIntegerPref( 153 registry->RegisterIntegerPref(
157 prefs::kScreenMagnifierType, 154 prefs::kScreenMagnifierType,
158 ash::kDefaultMagnifierType, 155 ash::kDefaultMagnifierType,
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 BooleanPrefMember::NamedChangeCallback callback = 311 BooleanPrefMember::NamedChangeCallback callback =
315 base::Bind(&Preferences::OnPreferenceChanged, base::Unretained(this)); 312 base::Bind(&Preferences::OnPreferenceChanged, base::Unretained(this));
316 313
317 performance_tracing_enabled_.Init(prefs::kPerformanceTracingEnabled, 314 performance_tracing_enabled_.Init(prefs::kPerformanceTracingEnabled,
318 prefs, callback); 315 prefs, callback);
319 tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, callback); 316 tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, callback);
320 tap_dragging_enabled_.Init(prefs::kTapDraggingEnabled, prefs, callback); 317 tap_dragging_enabled_.Init(prefs::kTapDraggingEnabled, prefs, callback);
321 three_finger_click_enabled_.Init(prefs::kEnableTouchpadThreeFingerClick, 318 three_finger_click_enabled_.Init(prefs::kEnableTouchpadThreeFingerClick,
322 prefs, callback); 319 prefs, callback);
323 natural_scroll_.Init(prefs::kNaturalScroll, prefs, callback); 320 natural_scroll_.Init(prefs::kNaturalScroll, prefs, callback);
324 a11y_spoken_feedback_enabled_.Init(prefs::kSpokenFeedbackEnabled,
325 prefs, callback);
326 a11y_high_contrast_enabled_.Init(prefs::kHighContrastEnabled, 321 a11y_high_contrast_enabled_.Init(prefs::kHighContrastEnabled,
327 prefs, callback); 322 prefs, callback);
328 a11y_screen_magnifier_enabled_.Init(prefs::kScreenMagnifierEnabled, 323 a11y_screen_magnifier_enabled_.Init(prefs::kScreenMagnifierEnabled,
329 prefs, callback); 324 prefs, callback);
330 a11y_screen_magnifier_type_.Init(prefs::kScreenMagnifierType, 325 a11y_screen_magnifier_type_.Init(prefs::kScreenMagnifierType,
331 prefs, callback); 326 prefs, callback);
332 a11y_screen_magnifier_scale_.Init(prefs::kScreenMagnifierScale, 327 a11y_screen_magnifier_scale_.Init(prefs::kScreenMagnifierScale,
333 prefs, callback); 328 prefs, callback);
334 mouse_sensitivity_.Init(prefs::kMouseSensitivity, prefs, callback); 329 mouse_sensitivity_.Init(prefs::kMouseSensitivity, prefs, callback);
335 touchpad_sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, callback); 330 touchpad_sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, callback);
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 } 618 }
624 619
625 void Preferences::OnTouchHudProjectionToggled(bool enabled) { 620 void Preferences::OnTouchHudProjectionToggled(bool enabled) {
626 if (touch_hud_projection_enabled_.GetValue() == enabled) 621 if (touch_hud_projection_enabled_.GetValue() == enabled)
627 return; 622 return;
628 623
629 touch_hud_projection_enabled_.SetValue(enabled); 624 touch_hud_projection_enabled_.SetValue(enabled);
630 } 625 }
631 626
632 } // namespace chromeos 627 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698