diff options
| author | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 16:50:13 +0000 |
|---|---|---|
| committer | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 16:50:13 +0000 |
| commit | ea75f30985b5b24627bed4c613a1ef403235aa02 (patch) | |
| tree | f4dc808b9c69a45f6bb2a943c160569ffd08881d /ash | |
| parent | 7636884d7a61515c9e6cc3ef8f7a58a939831480 (diff) | |
| download | chromium_src-ea75f30985b5b24627bed4c613a1ef403235aa02.zip chromium_src-ea75f30985b5b24627bed4c613a1ef403235aa02.tar.gz chromium_src-ea75f30985b5b24627bed4c613a1ef403235aa02.tar.bz2 | |
Do not start autoshutdown on lock button press.
BUG=chromium-os:35598
Review URL: https://chromiumcodereview.appspot.com/11238058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/wm/power_button_controller.cc | 4 | ||||
| -rw-r--r-- | ash/wm/session_state_controller.cc | 4 | ||||
| -rw-r--r-- | ash/wm/session_state_controller.h | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc index f7bc2f3..8b6c549 100644 --- a/ash/wm/power_button_controller.cc +++ b/ash/wm/power_button_controller.cc @@ -62,7 +62,7 @@ void PowerButtonController::OnPowerButtonEvent( return; if (controller_->IsEligibleForLock()) - controller_->StartLockAnimation(); + controller_->StartLockAnimation(true); else controller_->StartShutdownAnimation(); } else { // Button is up. @@ -92,7 +92,7 @@ void PowerButtonController::OnLockButtonEvent( return; if (down) - controller_->StartLockAnimation(); + controller_->StartLockAnimation(false); else controller_->CancelLockWithOtherAnimation(); } diff --git a/ash/wm/session_state_controller.cc b/ash/wm/session_state_controller.cc index 5253ac2..c090130 100644 --- a/ash/wm/session_state_controller.cc +++ b/ash/wm/session_state_controller.cc @@ -137,8 +137,8 @@ void SessionStateController::StartLockAnimationAndLockImmediately() { OnLockTimeout(); } -void SessionStateController::StartLockAnimation() { - shutdown_after_lock_ = true; +void SessionStateController::StartLockAnimation(bool shutdown_after_lock) { + shutdown_after_lock_ = shutdown_after_lock; animator_->ShowBlackLayer(); animator_->StartAnimation( diff --git a/ash/wm/session_state_controller.h b/ash/wm/session_state_controller.h index fc3ae53..47dbd9b 100644 --- a/ash/wm/session_state_controller.h +++ b/ash/wm/session_state_controller.h @@ -153,8 +153,9 @@ class ASH_EXPORT SessionStateController : public aura::RootWindowObserver, // Starts locking (with slow animation) that can be cancelled. // After locking and |kLockToShutdownTimeoutMs| StartShutdownAnimation() - // will be called unless CancelShutdown() is called. - virtual void StartLockAnimation(); + // will be called unless CancelShutdown() is called, if |shutdown_after_lock| + // is true. + virtual void StartLockAnimation(bool shutdown_after_lock); // Starts shutting down (with slow animation) that can be cancelled. virtual void StartShutdownAnimation(); |