diff options
| author | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 20:27:50 +0000 |
|---|---|---|
| committer | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 20:27:50 +0000 |
| commit | 948adfcfca37c614dbff91864a229c7f972a5dae (patch) | |
| tree | 67b21041dedafd74ea8a7f824bb777b4a9452f51 | |
| parent | 4bdb846472a1288fdbaeee16bbadaa007c9cf7a0 (diff) | |
| download | chromium_src-948adfcfca37c614dbff91864a229c7f972a5dae.zip chromium_src-948adfcfca37c614dbff91864a229c7f972a5dae.tar.gz chromium_src-948adfcfca37c614dbff91864a229c7f972a5dae.tar.bz2 | |
Start lock-to-shutdown timer after lock animation is finished
BUG=138171
Review URL: https://chromiumcodereview.appspot.com/11419092
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168858 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/wm/session_state_controller_impl2.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ash/wm/session_state_controller_impl2.cc b/ash/wm/session_state_controller_impl2.cc index d829b30..d8c156f 100644 --- a/ash/wm/session_state_controller_impl2.cc +++ b/ash/wm/session_state_controller_impl2.cc @@ -78,11 +78,6 @@ void SessionStateControllerImpl2::OnLockStateChanged(bool locked) { callback); lock_timer_.Stop(); lock_fail_timer_.Stop(); - - if (shutdown_after_lock_) { - shutdown_after_lock_ = false; - StartLockToShutdownTimer(); - } } else { animator_->StartAnimation( internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS | @@ -102,6 +97,10 @@ void SessionStateControllerImpl2::OnLockScreenAnimationFinished() { lock_screen_displayed_callback_.Run(); lock_screen_displayed_callback_.Reset(); } + if (shutdown_after_lock_) { + shutdown_after_lock_ = false; + StartLockToShutdownTimer(); + } } void SessionStateControllerImpl2::OnStartingLock() { |