chrome/browser/ui/ash/session_state_delegate_views.h - Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]*

Unified Diff: chrome/browser/ui/ash/session_state_delegate_views.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

« no previous file with comments | « chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc ('k') | chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/session_state_delegate_views.h

diff --git a/chrome/browser/ui/ash/session_state_delegate_views.h b/chrome/browser/ui/ash/session_state_delegate_views.h

index 421d11c80e762e2db69ad99aa1dd8a830678b776..44fc0a9a78bc9738a6503b2b7e8c21159eaba9f0 100644

--- a/chrome/browser/ui/ash/session_state_delegate_views.h

+++ b/chrome/browser/ui/ash/session_state_delegate_views.h

@@ -22,31 +22,31 @@ class SessionStateDelegate : public ash::SessionStateDelegate {

// 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 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 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;

private:

DISALLOW_COPY_AND_ASSIGN(SessionStateDelegate);