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

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

Issue 11642014: Re-introduce the partial magnifier (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Separate SetMagnifier into SetMagnifierEnabled and SetMagnifierType 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 "ash/magnifier/magnifier_constants.h"
7 #include "base/chromeos/chromeos_version.h" 8 #include "base/chromeos/chromeos_version.h"
8 #include "base/command_line.h" 9 #include "base/command_line.h"
9 #include "base/i18n/time_formatting.h" 10 #include "base/i18n/time_formatting.h"
10 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
11 #include "base/prefs/public/pref_member.h" 12 #include "base/prefs/public/pref_member.h"
12 #include "base/string_split.h" 13 #include "base/string_split.h"
13 #include "base/string_util.h" 14 #include "base/string_util.h"
14 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
15 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
17 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
16 #include "chrome/browser/chromeos/drive/drive_file_system_util.h" 18 #include "chrome/browser/chromeos/drive/drive_file_system_util.h"
17 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" 19 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
18 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 20 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
19 #include "chrome/browser/chromeos/input_method/input_method_util.h" 21 #include "chrome/browser/chromeos/input_method/input_method_util.h"
20 #include "chrome/browser/chromeos/input_method/xkeyboard.h" 22 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
21 #include "chrome/browser/chromeos/login/login_utils.h" 23 #include "chrome/browser/chromeos/login/login_utils.h"
22 #include "chrome/browser/chromeos/login/user_manager.h" 24 #include "chrome/browser/chromeos/login/user_manager.h"
23 #include "chrome/browser/chromeos/system/drm_settings.h" 25 #include "chrome/browser/chromeos/system/drm_settings.h"
24 #include "chrome/browser/chromeos/system/input_device_settings.h" 26 #include "chrome/browser/chromeos/system/input_device_settings.h"
25 #include "chrome/browser/chromeos/system/power_manager_settings.h" 27 #include "chrome/browser/chromeos/system/power_manager_settings.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 if (prefs->FindPreference(prefs::kHighContrastEnabled) == NULL) { 104 if (prefs->FindPreference(prefs::kHighContrastEnabled) == NULL) {
103 prefs->RegisterBooleanPref(prefs::kHighContrastEnabled, 105 prefs->RegisterBooleanPref(prefs::kHighContrastEnabled,
104 false, 106 false,
105 PrefService::UNSYNCABLE_PREF); 107 PrefService::UNSYNCABLE_PREF);
106 } 108 }
107 if (prefs->FindPreference(prefs::kScreenMagnifierEnabled) == NULL) { 109 if (prefs->FindPreference(prefs::kScreenMagnifierEnabled) == NULL) {
108 prefs->RegisterBooleanPref(prefs::kScreenMagnifierEnabled, 110 prefs->RegisterBooleanPref(prefs::kScreenMagnifierEnabled,
109 false, 111 false,
110 PrefService::SYNCABLE_PREF); 112 PrefService::SYNCABLE_PREF);
111 } 113 }
114 if (prefs->FindPreference(prefs::kScreenMagnifierType) == NULL) {
115 prefs->RegisterIntegerPref(prefs::kScreenMagnifierType,
116 ash::MAGNIFIER_DEFAULT,
117 PrefService::SYNCABLE_PREF);
118 }
112 if (prefs->FindPreference(prefs::kScreenMagnifierScale) == NULL) { 119 if (prefs->FindPreference(prefs::kScreenMagnifierScale) == NULL) {
113 prefs->RegisterDoublePref(prefs::kScreenMagnifierScale, 120 prefs->RegisterDoublePref(prefs::kScreenMagnifierScale,
114 std::numeric_limits<double>::min(), 121 std::numeric_limits<double>::min(),
115 PrefService::UNSYNCABLE_PREF); 122 PrefService::UNSYNCABLE_PREF);
116 } 123 }
117 if (prefs->FindPreference(prefs::kShouldAlwaysShowAccessibilityMenu) == 124 if (prefs->FindPreference(prefs::kShouldAlwaysShowAccessibilityMenu) ==
118 NULL) { 125 NULL) {
119 prefs->RegisterBooleanPref(prefs::kShouldAlwaysShowAccessibilityMenu, 126 prefs->RegisterBooleanPref(prefs::kShouldAlwaysShowAccessibilityMenu,
120 false, 127 false,
121 PrefService::UNSYNCABLE_PREF); 128 PrefService::UNSYNCABLE_PREF);
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, callback); 309 tap_to_click_enabled_.Init(prefs::kTapToClickEnabled, prefs, callback);
303 tap_dragging_enabled_.Init(prefs::kTapDraggingEnabled, prefs, callback); 310 tap_dragging_enabled_.Init(prefs::kTapDraggingEnabled, prefs, callback);
304 three_finger_click_enabled_.Init(prefs::kEnableTouchpadThreeFingerClick, 311 three_finger_click_enabled_.Init(prefs::kEnableTouchpadThreeFingerClick,
305 prefs, callback); 312 prefs, callback);
306 three_finger_swipe_enabled_.Init(prefs::kEnableTouchpadThreeFingerSwipe, 313 three_finger_swipe_enabled_.Init(prefs::kEnableTouchpadThreeFingerSwipe,
307 prefs, callback); 314 prefs, callback);
308 natural_scroll_.Init(prefs::kNaturalScroll, prefs, callback); 315 natural_scroll_.Init(prefs::kNaturalScroll, prefs, callback);
309 accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled, prefs, callback); 316 accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled, prefs, callback);
310 screen_magnifier_enabled_.Init(prefs::kScreenMagnifierEnabled, 317 screen_magnifier_enabled_.Init(prefs::kScreenMagnifierEnabled,
311 prefs, callback); 318 prefs, callback);
319 screen_magnifier_type_.Init(prefs::kScreenMagnifierType, prefs, callback);
312 screen_magnifier_scale_.Init(prefs::kScreenMagnifierScale, prefs, callback); 320 screen_magnifier_scale_.Init(prefs::kScreenMagnifierScale, prefs, callback);
313 mouse_sensitivity_.Init(prefs::kMouseSensitivity, prefs, callback); 321 mouse_sensitivity_.Init(prefs::kMouseSensitivity, prefs, callback);
314 touchpad_sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, callback); 322 touchpad_sensitivity_.Init(prefs::kTouchpadSensitivity, prefs, callback);
315 use_24hour_clock_.Init(prefs::kUse24HourClock, prefs, callback); 323 use_24hour_clock_.Init(prefs::kUse24HourClock, prefs, callback);
316 disable_drive_.Init(prefs::kDisableDrive, prefs, callback); 324 disable_drive_.Init(prefs::kDisableDrive, prefs, callback);
317 disable_drive_over_cellular_.Init(prefs::kDisableDriveOverCellular, 325 disable_drive_over_cellular_.Init(prefs::kDisableDriveOverCellular,
318 prefs, callback); 326 prefs, callback);
319 disable_drive_hosted_files_.Init(prefs::kDisableDriveHostedFiles, 327 disable_drive_hosted_files_.Init(prefs::kDisableDriveHostedFiles,
320 prefs, callback); 328 prefs, callback);
321 download_default_directory_.Init(prefs::kDownloadDefaultDirectory, 329 download_default_directory_.Init(prefs::kDownloadDefaultDirectory,
322 prefs, callback); 330 prefs, callback);
323 primary_mouse_button_right_.Init(prefs::kPrimaryMouseButtonRight, 331 primary_mouse_button_right_.Init(prefs::kPrimaryMouseButtonRight,
324 prefs, callback); 332 prefs, callback);
325 preferred_languages_.Init(prefs::kLanguagePreferredLanguages, 333 preferred_languages_.Init(prefs::kLanguagePreferredLanguages,
326 prefs, callback); 334 prefs, callback);
327 preload_engines_.Init(prefs::kLanguagePreloadEngines, prefs, callback); 335 preload_engines_.Init(prefs::kLanguagePreloadEngines, prefs, callback);
328 filtered_extension_imes_.Init(prefs::kLanguageFilteredExtensionImes, 336 filtered_extension_imes_.Init(prefs::kLanguageFilteredExtensionImes,
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 776
769 input_method::AutoRepeatRate rate; 777 input_method::AutoRepeatRate rate;
770 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue(); 778 rate.initial_delay_in_ms = xkb_auto_repeat_delay_pref_.GetValue();
771 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue(); 779 rate.repeat_interval_in_ms = xkb_auto_repeat_interval_pref_.GetValue();
772 DCHECK(rate.initial_delay_in_ms > 0); 780 DCHECK(rate.initial_delay_in_ms > 0);
773 DCHECK(rate.repeat_interval_in_ms > 0); 781 DCHECK(rate.repeat_interval_in_ms > 0);
774 input_method::XKeyboard::SetAutoRepeatRate(rate); 782 input_method::XKeyboard::SetAutoRepeatRate(rate);
775 } 783 }
776 784
777 } // namespace chromeos 785 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698