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

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

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 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
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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 owner_settings_service); 168 owner_settings_service);
169 169
170 const std::string& GetUsername() const; 170 const std::string& GetUsername() const;
171 171
172 // Adds an observer. 172 // Adds an observer.
173 void AddObserver(Observer* observer); 173 void AddObserver(Observer* observer);
174 // Removes an observer. 174 // Removes an observer.
175 void RemoveObserver(Observer* observer); 175 void RemoveObserver(Observer* observer);
176 176
177 // SessionManagerClient::Observer: 177 // SessionManagerClient::Observer:
178 virtual void OwnerKeySet(bool success) OVERRIDE; 178 virtual void OwnerKeySet(bool success) override;
179 virtual void PropertyChangeComplete(bool success) OVERRIDE; 179 virtual void PropertyChangeComplete(bool success) override;
180 180
181 private: 181 private:
182 friend class OwnerSettingsServiceChromeOS; 182 friend class OwnerSettingsServiceChromeOS;
183 183
184 // Enqueues a new operation. Takes ownership of |operation| and starts it 184 // Enqueues a new operation. Takes ownership of |operation| and starts it
185 // right away if there is no active operation currently. 185 // right away if there is no active operation currently.
186 void Enqueue(SessionManagerOperation* operation); 186 void Enqueue(SessionManagerOperation* operation);
187 187
188 // Enqueues a load operation. 188 // Enqueues a load operation.
189 void EnqueueLoad(bool force_key_load); 189 void EnqueueLoad(bool force_key_load);
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 ScopedTestDeviceSettingsService(); 252 ScopedTestDeviceSettingsService();
253 ~ScopedTestDeviceSettingsService(); 253 ~ScopedTestDeviceSettingsService();
254 254
255 private: 255 private:
256 DISALLOW_COPY_AND_ASSIGN(ScopedTestDeviceSettingsService); 256 DISALLOW_COPY_AND_ASSIGN(ScopedTestDeviceSettingsService);
257 }; 257 };
258 258
259 } // namespace chromeos 259 } // namespace chromeos
260 260
261 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_ 261 #endif // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698