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

Unified Diff: chrome/browser/ui/ash/session_state_delegate_chromeos.h

Issue 857433003: Update {virtual,override,final} to follow C++11 style chrome/browser/ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix rebase 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/session_state_delegate_chromeos.h
diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos.h b/chrome/browser/ui/ash/session_state_delegate_chromeos.h
index 114bcde0bd985ff135c60e25c774f45ec7fcd40b..9e7847f9cc6e65b01cd57aa413c03bce7f23b8b8 100644
--- a/chrome/browser/ui/ash/session_state_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.h
@@ -24,49 +24,45 @@ class SessionStateDelegateChromeos
public chromeos::UserAddingScreen::Observer {
public:
SessionStateDelegateChromeos();
- virtual ~SessionStateDelegateChromeos();
+ ~SessionStateDelegateChromeos() override;
// ash::SessionStateDelegate:
- virtual content::BrowserContext* GetBrowserContextByIndex(
+ content::BrowserContext* GetBrowserContextByIndex(
ash::MultiProfileIndex index) override;
- virtual content::BrowserContext* GetBrowserContextForWindow(
+ content::BrowserContext* GetBrowserContextForWindow(
aura::Window* window) override;
- virtual int GetMaximumNumberOfLoggedInUsers() const override;
- virtual int NumberOfLoggedInUsers() const override;
- virtual bool CanAddUserToMultiProfile(AddUserError* error) const override;
- virtual bool IsActiveUserSessionStarted() const override;
- virtual bool CanLockScreen() const override;
- virtual bool IsScreenLocked() const override;
- virtual bool ShouldLockScreenBeforeSuspending() const override;
- virtual void LockScreen() override;
- virtual void UnlockScreen() override;
- virtual bool IsUserSessionBlocked() const override;
- virtual SessionState GetSessionState() const override;
- virtual const user_manager::UserInfo* GetUserInfo(
+ int GetMaximumNumberOfLoggedInUsers() const override;
+ int NumberOfLoggedInUsers() const override;
+ bool CanAddUserToMultiProfile(AddUserError* error) const override;
+ bool IsActiveUserSessionStarted() const override;
+ bool CanLockScreen() const override;
+ bool IsScreenLocked() const override;
+ bool ShouldLockScreenBeforeSuspending() const override;
+ void LockScreen() override;
+ void UnlockScreen() override;
+ bool IsUserSessionBlocked() const override;
+ SessionState GetSessionState() const override;
+ const user_manager::UserInfo* GetUserInfo(
ash::MultiProfileIndex index) const override;
- virtual const user_manager::UserInfo* GetUserInfo(
+ const user_manager::UserInfo* GetUserInfo(
content::BrowserContext* context) const override;
- virtual bool ShouldShowAvatar(aura::Window* window) const override;
- virtual void SwitchActiveUser(const std::string& user_id) override;
- virtual void CycleActiveUser(CycleUser cycle_user) override;
- virtual bool IsMultiProfileAllowedByPrimaryUserPolicy() const override;
- virtual void AddSessionStateObserver(
- ash::SessionStateObserver* observer) override;
- virtual void RemoveSessionStateObserver(
- ash::SessionStateObserver* observer) override;
+ bool ShouldShowAvatar(aura::Window* window) const override;
+ void SwitchActiveUser(const std::string& user_id) override;
+ void CycleActiveUser(CycleUser cycle_user) override;
+ bool IsMultiProfileAllowedByPrimaryUserPolicy() const override;
+ void AddSessionStateObserver(ash::SessionStateObserver* observer) override;
+ void RemoveSessionStateObserver(ash::SessionStateObserver* observer) override;
// chromeos::LoginState::Observer overrides.
- virtual void LoggedInStateChanged() override;
+ void LoggedInStateChanged() override;
// user_manager::UserManager::UserSessionStateObserver:
- virtual void ActiveUserChanged(
- const user_manager::User* active_user) override;
- virtual void UserAddedToSession(
- const user_manager::User* added_user) override;
+ void ActiveUserChanged(const user_manager::User* active_user) override;
+ void UserAddedToSession(const user_manager::User* added_user) override;
// chromeos::UserAddingScreen::Observer:
- virtual void OnUserAddingStarted() override;
- virtual void OnUserAddingFinished() override;
+ void OnUserAddingStarted() override;
+ void OnUserAddingFinished() override;
private:
// Sets session state to |new_state|.

Powered by Google App Engine
This is Rietveld 408576698