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

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

Issue 11194011: Reverting this CL because it was committed before I gave the final LGTM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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
Property Changes:
Added: svn:mergeinfo
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 #ifndef CHROME_BROWSER_CHROMEOS_PREFERENCES_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
6 #define CHROME_BROWSER_CHROMEOS_PREFERENCES_H_ 6 #define CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 95
96 PrefService* prefs_; 96 PrefService* prefs_;
97 97
98 input_method::InputMethodManager* input_method_manager_; 98 input_method::InputMethodManager* input_method_manager_;
99 99
100 BooleanPrefMember tap_to_click_enabled_; 100 BooleanPrefMember tap_to_click_enabled_;
101 BooleanPrefMember three_finger_click_enabled_; 101 BooleanPrefMember three_finger_click_enabled_;
102 BooleanPrefMember natural_scroll_; 102 BooleanPrefMember natural_scroll_;
103 BooleanPrefMember vert_edge_scroll_enabled_; 103 BooleanPrefMember vert_edge_scroll_enabled_;
104 BooleanPrefMember accessibility_enabled_; 104 BooleanPrefMember accessibility_enabled_;
105 BooleanPrefMember screen_magnifier_enabled_;
106 DoublePrefMember screen_magnifier_scale_;
107 IntegerPrefMember speed_factor_; 105 IntegerPrefMember speed_factor_;
108 IntegerPrefMember mouse_sensitivity_; 106 IntegerPrefMember mouse_sensitivity_;
109 IntegerPrefMember touchpad_sensitivity_; 107 IntegerPrefMember touchpad_sensitivity_;
110 BooleanPrefMember primary_mouse_button_right_; 108 BooleanPrefMember primary_mouse_button_right_;
111 BooleanPrefMember use_24hour_clock_; 109 BooleanPrefMember use_24hour_clock_;
112 BooleanPrefMember disable_drive_; 110 BooleanPrefMember disable_drive_;
113 BooleanPrefMember disable_drive_over_cellular_; 111 BooleanPrefMember disable_drive_over_cellular_;
114 BooleanPrefMember disable_drive_hosted_files_; 112 BooleanPrefMember disable_drive_hosted_files_;
115 FilePathPrefMember download_default_directory_; 113 FilePathPrefMember download_default_directory_;
116 114
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 BooleanPrefMember enable_screen_lock_; 147 BooleanPrefMember enable_screen_lock_;
150 148
151 BooleanPrefMember enable_drm_; 149 BooleanPrefMember enable_drm_;
152 150
153 DISALLOW_COPY_AND_ASSIGN(Preferences); 151 DISALLOW_COPY_AND_ASSIGN(Preferences);
154 }; 152 };
155 153
156 } // namespace chromeos 154 } // namespace chromeos
157 155
158 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_ 156 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.cc ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698