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

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

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: iwyu fixes Created 4 years, 8 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
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 9
10 #include "ash/shell_observer.h" 10 #include "ash/shell_observer.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 void OnTouchHudProjectionToggled(bool enabled) override; 111 void OnTouchHudProjectionToggled(bool enabled) override;
112 112
113 // Overriden form user_manager::UserManager::UserSessionStateObserver. 113 // Overriden form user_manager::UserManager::UserSessionStateObserver.
114 void ActiveUserChanged(const user_manager::User* active_user) override; 114 void ActiveUserChanged(const user_manager::User* active_user) override;
115 115
116 void ActivateInputMethods(const user_manager::User* active_user); 116 void ActivateInputMethods(const user_manager::User* active_user);
117 117
118 syncable_prefs::PrefServiceSyncable* prefs_; 118 syncable_prefs::PrefServiceSyncable* prefs_;
119 119
120 input_method::InputMethodManager* input_method_manager_; 120 input_method::InputMethodManager* input_method_manager_;
121 scoped_ptr<TracingManager> tracing_manager_; 121 std::unique_ptr<TracingManager> tracing_manager_;
122 122
123 BooleanPrefMember performance_tracing_enabled_; 123 BooleanPrefMember performance_tracing_enabled_;
124 BooleanPrefMember tap_to_click_enabled_; 124 BooleanPrefMember tap_to_click_enabled_;
125 BooleanPrefMember tap_dragging_enabled_; 125 BooleanPrefMember tap_dragging_enabled_;
126 BooleanPrefMember three_finger_click_enabled_; 126 BooleanPrefMember three_finger_click_enabled_;
127 BooleanPrefMember unified_desktop_enabled_by_default_; 127 BooleanPrefMember unified_desktop_enabled_by_default_;
128 BooleanPrefMember natural_scroll_; 128 BooleanPrefMember natural_scroll_;
129 BooleanPrefMember vert_edge_scroll_enabled_; 129 BooleanPrefMember vert_edge_scroll_enabled_;
130 IntegerPrefMember speed_factor_; 130 IntegerPrefMember speed_factor_;
131 IntegerPrefMember mouse_sensitivity_; 131 IntegerPrefMember mouse_sensitivity_;
(...skipping 19 matching lines...) Expand all
151 151
152 // User owning these preferences. 152 // User owning these preferences.
153 const user_manager::User* user_; 153 const user_manager::User* user_;
154 154
155 // Whether user is a primary user. 155 // Whether user is a primary user.
156 bool user_is_primary_; 156 bool user_is_primary_;
157 157
158 // Input Methods state for this user. 158 // Input Methods state for this user.
159 scoped_refptr<input_method::InputMethodManager::State> ime_state_; 159 scoped_refptr<input_method::InputMethodManager::State> ime_state_;
160 160
161 scoped_ptr<input_method::InputMethodSyncer> input_method_syncer_; 161 std::unique_ptr<input_method::InputMethodSyncer> input_method_syncer_;
162 162
163 DISALLOW_COPY_AND_ASSIGN(Preferences); 163 DISALLOW_COPY_AND_ASSIGN(Preferences);
164 }; 164 };
165 165
166 } // namespace chromeos 166 } // namespace chromeos
167 167
168 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_ 168 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698