| Index: ash/test/test_session_state_delegate.h
|
| diff --git a/ash/test/test_session_state_delegate.h b/ash/test/test_session_state_delegate.h
|
| index 11d7ce2d332f7cac0f951696b1002f9eb1280ccb..a77b3cdbeaf8cce57c8ada74ed257a656bcf233a 100644
|
| --- a/ash/test/test_session_state_delegate.h
|
| +++ b/ash/test/test_session_state_delegate.h
|
| @@ -20,39 +20,37 @@ class MockUserInfo;
|
| class TestSessionStateDelegate : public SessionStateDelegate {
|
| public:
|
| TestSessionStateDelegate();
|
| - virtual ~TestSessionStateDelegate();
|
| + ~TestSessionStateDelegate() override;
|
|
|
| void set_logged_in_users(int users) { logged_in_users_ = users; }
|
| void AddUser(const std::string user_id);
|
| const user_manager::UserInfo* GetActiveUserInfo() const;
|
|
|
| // SessionStateDelegate:
|
| - virtual content::BrowserContext* GetBrowserContextByIndex(
|
| + content::BrowserContext* GetBrowserContextByIndex(
|
| 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 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 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;
|
|
|
| // TODO(oshima): Use state machine instead of using boolean variables.
|
|
|
|
|