diff options
| author | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 01:40:07 +0000 |
|---|---|---|
| committer | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 01:40:07 +0000 |
| commit | 490ebe11e8420e5471ff7bc0e7128d7404733bba (patch) | |
| tree | e81aa553778bdf92bfde2e8fbc5aa40d7101671b /ash | |
| parent | f282ad0d20fa5bd1ead17a672ed118067d90c7f2 (diff) | |
| download | chromium_src-490ebe11e8420e5471ff7bc0e7128d7404733bba.zip chromium_src-490ebe11e8420e5471ff7bc0e7128d7404733bba.tar.gz chromium_src-490ebe11e8420e5471ff7bc0e7128d7404733bba.tar.bz2 | |
Hide cursor upon lock animation
BUG=173944
Review URL: https://chromiumcodereview.appspot.com/13637009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/wm/session_state_controller_impl2.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ash/wm/session_state_controller_impl2.cc b/ash/wm/session_state_controller_impl2.cc index bb5c68e..4e533a4 100644 --- a/ash/wm/session_state_controller_impl2.cc +++ b/ash/wm/session_state_controller_impl2.cc @@ -263,6 +263,7 @@ void SessionStateControllerImpl2::CancelShutdownAnimation() { shutdown_after_lock_ = false; return; } + animator_->StartGlobalAnimation( internal::SessionStateAnimator::ANIMATION_UNDO_GRAYSCALE_BRIGHTNESS, internal::SessionStateAnimator::ANIMATION_SPEED_REVERT_SHUTDOWN); @@ -311,6 +312,11 @@ void SessionStateControllerImpl2::OnLockToShutdownTimeout() { } void SessionStateControllerImpl2::StartCancellableShutdownAnimation() { + Shell* shell = ash::Shell::GetInstance(); + // Hide cursor, but let it reappear if the mouse moves. + shell->env_filter()->set_cursor_hidden_by_filter(true); + shell->cursor_manager()->HideCursor(); + animator_->StartGlobalAnimation( internal::SessionStateAnimator::ANIMATION_GRAYSCALE_BRIGHTNESS, internal::SessionStateAnimator::ANIMATION_SPEED_SHUTDOWN); |