diff options
| author | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 13:58:27 +0000 |
|---|---|---|
| committer | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 13:58:27 +0000 |
| commit | 91545875f50bd58f48d1311355c8f0e4eef847e6 (patch) | |
| tree | dcca143751c99c5434f72f3fc26fe7371dc3b257 /ash/wm/session_state_controller.h | |
| parent | 125d7dcd64991fa580bcd9cb98e43e9baa28f670 (diff) | |
| download | chromium_src-91545875f50bd58f48d1311355c8f0e4eef847e6.zip chromium_src-91545875f50bd58f48d1311355c8f0e4eef847e6.tar.gz chromium_src-91545875f50bd58f48d1311355c8f0e4eef847e6.tar.bz2 | |
Let chromeos::User decide whether the current session can be locked
We have several different methods that try to determine whether the
current session can be locked. This redundancy is difficult to maintain
and has drifted out of sync in the past. The CL consolidates all checks
and makes the chromeos::User class the autoritative source for whether
the current session can be locked or not.
BUG=152928
Review URL: https://chromiumcodereview.appspot.com/11412100
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169031 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/session_state_controller.h')
| -rw-r--r-- | ash/wm/session_state_controller.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/ash/wm/session_state_controller.h b/ash/wm/session_state_controller.h index 53e28cd..703a680 100644 --- a/ash/wm/session_state_controller.h +++ b/ash/wm/session_state_controller.h @@ -73,12 +73,6 @@ class ASH_EXPORT SessionStateController : public aura::RootWindowObserver, void SetDelegate(SessionStateControllerDelegate* delegate); - // Returns true iff when we're in state when user session can be locked. - virtual bool IsEligibleForLock() = 0; - - // Returns true if system is locked. - virtual bool IsLocked() = 0; - // Starts locking (with slow animation) that can be cancelled. // After locking and |kLockToShutdownTimeoutMs| StartShutdownAnimation() // will be called unless CancelShutdownAnimation() is called, if @@ -129,8 +123,6 @@ class ASH_EXPORT SessionStateController : public aura::RootWindowObserver, protected: friend class test::PowerButtonControllerTest; - bool IsLoggedInAsNonGuest() const; - scoped_ptr<internal::SessionStateAnimator> animator_; scoped_ptr<SessionStateControllerDelegate> delegate_; |