| Index: chrome/browser/chromeos/preferences.cc
|
| diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
|
| index e4490ceb8d77682a66a8d3e4f6d5c9d7441310cf..56a926649cdd6860a27a29fadbf05acbdbb0d12e 100644
|
| --- a/chrome/browser/chromeos/preferences.cc
|
| +++ b/chrome/browser/chromeos/preferences.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/chromeos/preferences.h"
|
|
|
| #include "ash/magnifier/magnifier_constants.h"
|
| +#include "ash/shell_delegate.h"
|
| #include "base/chromeos/chromeos_version.h"
|
| #include "base/command_line.h"
|
| #include "base/i18n/time_formatting.h"
|
| @@ -60,10 +61,8 @@ Preferences::~Preferences() {
|
|
|
| // static
|
| void Preferences::RegisterPrefs(PrefRegistrySimple* registry) {
|
| - registry->RegisterBooleanPref(prefs::kHighContrastEnabled, false);
|
| registry->RegisterBooleanPref(prefs::kOwnerPrimaryMouseButtonRight, false);
|
| registry->RegisterBooleanPref(prefs::kOwnerTapToClickEnabled, true);
|
| - registry->RegisterBooleanPref(prefs::kSpokenFeedbackEnabled, false);
|
| registry->RegisterBooleanPref(prefs::kVirtualKeyboardEnabled, false);
|
| }
|
|
|
| @@ -108,6 +107,12 @@ void Preferences::RegisterUserPrefs(PrefRegistrySyncable* registry) {
|
| registry->RegisterBooleanPref(prefs::kLabsAdvancedFilesystemEnabled,
|
| false,
|
| PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterBooleanPref(prefs::kSpokenFeedbackEnabled,
|
| + false,
|
| + PrefRegistrySyncable::SYNCABLE_PREF);
|
| + registry->RegisterBooleanPref(prefs::kHighContrastEnabled,
|
| + false,
|
| + PrefRegistrySyncable::SYNCABLE_PREF);
|
| registry->RegisterBooleanPref(prefs::kScreenMagnifierEnabled,
|
| false,
|
| PrefRegistrySyncable::SYNCABLE_PREF);
|
| @@ -347,10 +352,16 @@ void Preferences::InitUserPrefs(PrefServiceSyncable* prefs) {
|
| three_finger_swipe_enabled_.Init(prefs::kEnableTouchpadThreeFingerSwipe,
|
| prefs, callback);
|
| natural_scroll_.Init(prefs::kNaturalScroll, prefs, callback);
|
| - screen_magnifier_enabled_.Init(prefs::kScreenMagnifierEnabled,
|
| - prefs, callback);
|
| - screen_magnifier_type_.Init(prefs::kScreenMagnifierType, prefs, callback);
|
| - screen_magnifier_scale_.Init(prefs::kScreenMagnifierScale, prefs, callback);
|
| + a11y_spoken_feedback_enabled_.Init(prefs::kSpokenFeedbackEnabled,
|
| + prefs, callback);
|
| + a11y_high_contrast_enabled_.Init(prefs::kHighContrastEnabled,
|
| + prefs, callback);
|
| + a11y_screen_magnifier_enabled_.Init(prefs::kScreenMagnifierEnabled,
|
| + prefs, callback);
|
| + a11y_screen_magnifier_type_.Init(prefs::kScreenMagnifierType,
|
| + prefs, callback);
|
| + a11y_screen_magnifier_scale_.Init(prefs::kScreenMagnifierScale,
|
| + prefs, callback);
|
| mouse_sensitivity_.Init(prefs::kMouseSensitivity, prefs, callback);
|
| touchpad_sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, callback);
|
| use_24hour_clock_.Init(prefs::kUse24HourClock, prefs, callback);
|
|
|