summaryrefslogtreecommitdiffstats
path: root/ash/wm/session_state_controller_impl2.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ash/wm/session_state_controller_impl2.cc')
-rw-r--r--ash/wm/session_state_controller_impl2.cc16
1 files changed, 1 insertions, 15 deletions
diff --git a/ash/wm/session_state_controller_impl2.cc b/ash/wm/session_state_controller_impl2.cc
index d8c156f..0cacb44 100644
--- a/ash/wm/session_state_controller_impl2.cc
+++ b/ash/wm/session_state_controller_impl2.cc
@@ -62,7 +62,7 @@ void SessionStateControllerImpl2::OnAppTerminating() {
}
void SessionStateControllerImpl2::OnLockStateChanged(bool locked) {
- if (shutting_down_ || (IsLocked()) == locked)
+ if (shutting_down_ || (system_is_locked_ == locked))
return;
system_is_locked_ = locked;
@@ -147,14 +147,6 @@ void SessionStateControllerImpl2::StartShutdownAnimation() {
StartPreShutdownAnimationTimer();
}
-bool SessionStateControllerImpl2::IsEligibleForLock() {
- return IsLoggedInAsNonGuest() && !IsLocked() && !LockRequested();
-}
-
-bool SessionStateControllerImpl2::IsLocked() {
- return system_is_locked_;
-}
-
bool SessionStateControllerImpl2::LockRequested() {
return lock_fail_timer_.IsRunning();
}
@@ -227,12 +219,6 @@ void SessionStateControllerImpl2::OnRootWindowHostCloseRequested(
Shell::GetInstance()->delegate()->Exit();
}
-bool SessionStateControllerImpl2::IsLoggedInAsNonGuest() const {
- // TODO(mukai): think about kiosk mode.
- return (login_status_ != user::LOGGED_IN_NONE) &&
- (login_status_ != user::LOGGED_IN_GUEST);
-}
-
void SessionStateControllerImpl2::StartLockTimer() {
lock_timer_.Stop();
lock_timer_.Start(