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

Side by Side Diff: chrome/browser/chromeos/login/user_manager_impl.h

Issue 11421186: Revert 170518 - Remove spurious OVERRIDE (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_LOGIN_USER_MANAGER_IMPL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 const std::string& username) const OVERRIDE; 64 const std::string& username) const OVERRIDE;
65 virtual void SaveUserDisplayEmail(const std::string& username, 65 virtual void SaveUserDisplayEmail(const std::string& username,
66 const std::string& display_email) OVERRIDE; 66 const std::string& display_email) OVERRIDE;
67 virtual std::string GetUserDisplayEmail( 67 virtual std::string GetUserDisplayEmail(
68 const std::string& username) const OVERRIDE; 68 const std::string& username) const OVERRIDE;
69 virtual bool IsCurrentUserOwner() const OVERRIDE; 69 virtual bool IsCurrentUserOwner() const OVERRIDE;
70 virtual bool IsCurrentUserNew() const OVERRIDE; 70 virtual bool IsCurrentUserNew() const OVERRIDE;
71 virtual bool IsCurrentUserEphemeral() const OVERRIDE; 71 virtual bool IsCurrentUserEphemeral() const OVERRIDE;
72 virtual bool CanCurrentUserLock() const OVERRIDE; 72 virtual bool CanCurrentUserLock() const OVERRIDE;
73 virtual bool IsUserLoggedIn() const OVERRIDE; 73 virtual bool IsUserLoggedIn() const OVERRIDE;
74 virtual bool IsLoggedInAsRegularUser() const; 74 virtual bool IsLoggedInAsRegularUser() const OVERRIDE;
75 virtual bool IsLoggedInAsDemoUser() const OVERRIDE; 75 virtual bool IsLoggedInAsDemoUser() const OVERRIDE;
76 virtual bool IsLoggedInAsPublicAccount() const OVERRIDE; 76 virtual bool IsLoggedInAsPublicAccount() const OVERRIDE;
77 virtual bool IsLoggedInAsGuest() const OVERRIDE; 77 virtual bool IsLoggedInAsGuest() const OVERRIDE;
78 virtual bool IsLoggedInAsStub() const OVERRIDE; 78 virtual bool IsLoggedInAsStub() const OVERRIDE;
79 virtual bool IsSessionStarted() const OVERRIDE; 79 virtual bool IsSessionStarted() const OVERRIDE;
80 virtual bool IsEphemeralUser(const std::string& email) const OVERRIDE; 80 virtual bool IsEphemeralUser(const std::string& email) const OVERRIDE;
81 virtual void AddObserver(UserManager::Observer* obs) OVERRIDE; 81 virtual void AddObserver(UserManager::Observer* obs) OVERRIDE;
82 virtual void RemoveObserver(UserManager::Observer* obs) OVERRIDE; 82 virtual void RemoveObserver(UserManager::Observer* obs) OVERRIDE;
83 virtual void NotifyLocalStateChanged() OVERRIDE; 83 virtual void NotifyLocalStateChanged() OVERRIDE;
84 84
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 201
202 // User avatar manager. 202 // User avatar manager.
203 scoped_ptr<UserImageManagerImpl> user_image_manager_; 203 scoped_ptr<UserImageManagerImpl> user_image_manager_;
204 204
205 DISALLOW_COPY_AND_ASSIGN(UserManagerImpl); 205 DISALLOW_COPY_AND_ASSIGN(UserManagerImpl);
206 }; 206 };
207 207
208 } // namespace chromeos 208 } // namespace chromeos
209 209
210 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_ 210 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698