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

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

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 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 a95b4b927eed3c424e8c34f2a1f166fc9b0fc7b4..114bcde0bd985ff135c60e25c774f45ec7fcd40b 100644
--- a/chrome/browser/ui/ash/session_state_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.h
@@ -28,45 +28,45 @@ class SessionStateDelegateChromeos
// ash::SessionStateDelegate:
virtual content::BrowserContext* GetBrowserContextByIndex(
- ash::MultiProfileIndex index) OVERRIDE;
+ ash::MultiProfileIndex index) override;
virtual 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;
+ 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(
- ash::MultiProfileIndex index) const OVERRIDE;
+ ash::MultiProfileIndex index) const override;
virtual 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;
+ 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;
+ ash::SessionStateObserver* observer) override;
virtual void RemoveSessionStateObserver(
- ash::SessionStateObserver* observer) OVERRIDE;
+ ash::SessionStateObserver* observer) override;
// chromeos::LoginState::Observer overrides.
- virtual void LoggedInStateChanged() OVERRIDE;
+ virtual void LoggedInStateChanged() override;
// user_manager::UserManager::UserSessionStateObserver:
virtual void ActiveUserChanged(
- const user_manager::User* active_user) OVERRIDE;
+ const user_manager::User* active_user) override;
virtual void UserAddedToSession(
- const user_manager::User* added_user) OVERRIDE;
+ const user_manager::User* added_user) override;
// chromeos::UserAddingScreen::Observer:
- virtual void OnUserAddingStarted() OVERRIDE;
- virtual void OnUserAddingFinished() OVERRIDE;
+ virtual void OnUserAddingStarted() override;
+ virtual void OnUserAddingFinished() override;
private:
// Sets session state to |new_state|.
« no previous file with comments | « chrome/browser/ui/ash/screenshot_taker_unittest.cc ('k') | chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698