Index: ash/wm/session_state_controller_impl2.cc |
diff --git a/ash/wm/session_state_controller_impl2.cc b/ash/wm/session_state_controller_impl2.cc |
index bb5c68eaa789d0fd7cc7b128e6ac7d3b5ff1694a..4e533a4a9c8472dc24aa768a51d0ef1c8b5b0827 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); |