Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(361)

Unified Diff: ash/wm/session_state_controller_impl2.cc

Issue 13637009: Hide cursor upon lock animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove commented code Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698