chrome/browser/chromeos/preferences.h - Issue 11821053: Revert 176087

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

Issue 11821053: Revert 176087 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 7 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

Property Changes:

Deleted: svn:mergeinfo

OLD	NEW
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 93 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
104 input_method::InputMethodManager* input_method_manager_;	104 input_method::InputMethodManager* input_method_manager_;

105	105

106 BooleanPrefMember tap_to_click_enabled_;	106 BooleanPrefMember tap_to_click_enabled_;

107 BooleanPrefMember tap_dragging_enabled_;	107 BooleanPrefMember tap_dragging_enabled_;

108 BooleanPrefMember three_finger_click_enabled_;	108 BooleanPrefMember three_finger_click_enabled_;

109 BooleanPrefMember three_finger_swipe_enabled_;	109 BooleanPrefMember three_finger_swipe_enabled_;

110 BooleanPrefMember natural_scroll_;	110 BooleanPrefMember natural_scroll_;

111 BooleanPrefMember vert_edge_scroll_enabled_;	111 BooleanPrefMember vert_edge_scroll_enabled_;

112 BooleanPrefMember accessibility_enabled_;	112 BooleanPrefMember accessibility_enabled_;

113 BooleanPrefMember screen_magnifier_enabled_;	113 BooleanPrefMember screen_magnifier_enabled_;

114 IntegerPrefMember screen_magnifier_type_;

115 DoublePrefMember screen_magnifier_scale_;	114 DoublePrefMember screen_magnifier_scale_;

116 IntegerPrefMember speed_factor_;	115 IntegerPrefMember speed_factor_;

117 IntegerPrefMember mouse_sensitivity_;	116 IntegerPrefMember mouse_sensitivity_;

118 IntegerPrefMember touchpad_sensitivity_;	117 IntegerPrefMember touchpad_sensitivity_;

119 BooleanPrefMember primary_mouse_button_right_;	118 BooleanPrefMember primary_mouse_button_right_;

120 BooleanPrefMember use_24hour_clock_;	119 BooleanPrefMember use_24hour_clock_;

121 BooleanPrefMember disable_drive_;	120 BooleanPrefMember disable_drive_;

122 BooleanPrefMember disable_drive_over_cellular_;	121 BooleanPrefMember disable_drive_over_cellular_;

123 BooleanPrefMember disable_drive_hosted_files_;	122 BooleanPrefMember disable_drive_hosted_files_;

124 FilePathPrefMember download_default_directory_;	123 FilePathPrefMember download_default_directory_;

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
158 BooleanPrefMember enable_screen_lock_;	157 BooleanPrefMember enable_screen_lock_;

159	158

160 BooleanPrefMember enable_drm_;	159 BooleanPrefMember enable_drm_;

161	160

162 DISALLOW_COPY_AND_ASSIGN(Preferences);	161 DISALLOW_COPY_AND_ASSIGN(Preferences);

163 };	162 };

164	163

165 } // namespace chromeos	164 } // namespace chromeos

166	165

167 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_	166 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_

OLD	NEW