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

Side by Side Diff: chrome/browser/chromeos/settings/device_settings_service.h

Issue 851123003: Update {virtual,override,final} to follow C++11 style in chrome/browser/chromeos/settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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_SETTINGS_DEVICE_SETTINGS_SERVICE_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_
6 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_ 6 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 88
89 // Manage singleton instance. 89 // Manage singleton instance.
90 static void Initialize(); 90 static void Initialize();
91 static bool IsInitialized(); 91 static bool IsInitialized();
92 static void Shutdown(); 92 static void Shutdown();
93 static DeviceSettingsService* Get(); 93 static DeviceSettingsService* Get();
94 94
95 // Creates a device settings service instance. This is meant for unit tests, 95 // Creates a device settings service instance. This is meant for unit tests,
96 // production code uses the singleton returned by Get() above. 96 // production code uses the singleton returned by Get() above.
97 DeviceSettingsService(); 97 DeviceSettingsService();
98 virtual ~DeviceSettingsService(); 98 ~DeviceSettingsService() override;
99 99
100 // To be called on startup once threads are initialized and DBus is ready. 100 // To be called on startup once threads are initialized and DBus is ready.
101 void SetSessionManager(SessionManagerClient* session_manager_client, 101 void SetSessionManager(SessionManagerClient* session_manager_client,
102 scoped_refptr<ownership::OwnerKeyUtil> owner_key_util); 102 scoped_refptr<ownership::OwnerKeyUtil> owner_key_util);
103 103
104 // Prevents the service from making further calls to session_manager_client 104 // Prevents the service from making further calls to session_manager_client
105 // and stops any pending operations. 105 // and stops any pending operations.
106 void UnsetSessionManager(); 106 void UnsetSessionManager();
107 107
108 SessionManagerClient* session_manager_client() const { 108 SessionManagerClient* session_manager_client() const {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 const std::string& GetUsername() const; 167 const std::string& GetUsername() const;
168 168
169 ownership::OwnerSettingsService* GetOwnerSettingsService() const; 169 ownership::OwnerSettingsService* GetOwnerSettingsService() const;
170 170
171 // Adds an observer. 171 // Adds an observer.
172 void AddObserver(Observer* observer); 172 void AddObserver(Observer* observer);
173 // Removes an observer. 173 // Removes an observer.
174 void RemoveObserver(Observer* observer); 174 void RemoveObserver(Observer* observer);
175 175
176 // SessionManagerClient::Observer: 176 // SessionManagerClient::Observer:
177 virtual void OwnerKeySet(bool success) override; 177 void OwnerKeySet(bool success) override;
178 virtual void PropertyChangeComplete(bool success) override; 178 void PropertyChangeComplete(bool success) override;
179 179
180 private: 180 private:
181 friend class OwnerSettingsServiceChromeOS; 181 friend class OwnerSettingsServiceChromeOS;
182 182
183 // Enqueues a new operation. Takes ownership of |operation| and starts it 183 // Enqueues a new operation. Takes ownership of |operation| and starts it
184 // right away if there is no active operation currently. 184 // right away if there is no active operation currently.
185 void Enqueue(const linked_ptr<SessionManagerOperation>& operation); 185 void Enqueue(const linked_ptr<SessionManagerOperation>& operation);
186 186
187 // Enqueues a load operation. 187 // Enqueues a load operation.
188 void EnqueueLoad(bool force_key_load); 188 void EnqueueLoad(bool force_key_load);
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 ScopedTestDeviceSettingsService(); 238 ScopedTestDeviceSettingsService();
239 ~ScopedTestDeviceSettingsService(); 239 ~ScopedTestDeviceSettingsService();
240 240
241 private: 241 private:
242 DISALLOW_COPY_AND_ASSIGN(ScopedTestDeviceSettingsService); 242 DISALLOW_COPY_AND_ASSIGN(ScopedTestDeviceSettingsService);
243 }; 243 };
244 244
245 } // namespace chromeos 245 } // namespace chromeos
246 246
247 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_ 247 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698