Index: chrome/browser/chromeos/preferences.cc |
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc |
index 8ee9f98d188e8394c784d53710c3b1a5c844cbd0..5aa9e7f777f4ea2e779a4b1056d12a93f7c16a50 100644 |
--- a/chrome/browser/chromeos/preferences.cc |
+++ b/chrome/browser/chromeos/preferences.cc |
@@ -4,6 +4,7 @@ |
#include "chrome/browser/chromeos/preferences.h" |
+#include "ash/magnifier/magnifier_constants.h" |
#include "base/chromeos/chromeos_version.h" |
#include "base/command_line.h" |
#include "base/i18n/time_formatting.h" |
@@ -13,6 +14,7 @@ |
#include "base/string_util.h" |
#include "base/utf_string_conversions.h" |
#include "chrome/browser/browser_process.h" |
+#include "chrome/browser/chromeos/accessibility/magnification_manager.h" |
#include "chrome/browser/chromeos/drive/drive_file_system_util.h" |
#include "chrome/browser/chromeos/input_method/input_method_configuration.h" |
#include "chrome/browser/chromeos/input_method/input_method_manager.h" |
@@ -114,6 +116,9 @@ void Preferences::RegisterUserPrefs(PrefServiceSyncable* prefs) { |
prefs->RegisterBooleanPref(prefs::kScreenMagnifierEnabled, |
false, |
PrefServiceSyncable::SYNCABLE_PREF); |
+ prefs->RegisterIntegerPref(prefs::kScreenMagnifierType, |
+ ash::kDefaultMagnifierType, |
+ PrefServiceSyncable::SYNCABLE_PREF); |
prefs->RegisterDoublePref(prefs::kScreenMagnifierScale, |
std::numeric_limits<double>::min(), |
PrefServiceSyncable::UNSYNCABLE_PREF); |
@@ -304,13 +309,14 @@ void Preferences::InitUserPrefs(PrefServiceSyncable* prefs) { |
accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled, 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); |
mouse_sensitivity_.Init(prefs::kMouseSensitivity, prefs, callback); |
touchpad_sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, callback); |
use_24hour_clock_.Init(prefs::kUse24HourClock, prefs, callback); |
disable_drive_.Init(prefs::kDisableDrive, prefs, callback); |
disable_drive_over_cellular_.Init(prefs::kDisableDriveOverCellular, |
- prefs, callback); |
+ prefs, callback); |
disable_drive_hosted_files_.Init(prefs::kDisableDriveHostedFiles, |
prefs, callback); |
download_default_directory_.Init(prefs::kDownloadDefaultDirectory, |