| 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 8d90e036c466b67ea353b741c6a7f69728355f96..dc85139fac2d49c37bba5687ab5b5065ad7105b9 100644
|
| --- a/chrome/browser/ui/ash/session_state_delegate_chromeos.h
|
| +++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.h
|
| @@ -37,7 +37,7 @@ class SessionStateDelegateChromeos
|
| void LockScreen() override;
|
| void UnlockScreen() override;
|
| bool IsUserSessionBlocked() const override;
|
| - SessionState GetSessionState() const override;
|
| + session_manager::SessionState GetSessionState() const override;
|
| const user_manager::UserInfo* GetUserInfo(
|
| ash::UserIndex index) const override;
|
| bool ShouldShowAvatar(ash::WmWindow* window) const override;
|
| @@ -63,7 +63,7 @@ class SessionStateDelegateChromeos
|
| // Sets session state to |new_state|.
|
| // If |force| is true then |new_state| is set even if existing session
|
| // state is the same (used for explicit initialization).
|
| - void SetSessionState(SessionState new_state, bool force);
|
| + void SetSessionState(session_manager::SessionState new_state, bool force);
|
|
|
| // Notify observers about session state change.
|
| void NotifySessionStateChanged();
|
| @@ -76,7 +76,7 @@ class SessionStateDelegateChromeos
|
| base::ObserverList<ash::SessionStateObserver> session_state_observer_list_;
|
|
|
| // Session state (e.g. login screen vs. user session).
|
| - SessionState session_state_;
|
| + session_manager::SessionState session_state_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateChromeos);
|
| };
|
|
|