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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/session_state_controller_impl.cc

Issue 11956019: Merge 173933 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/
Patch Set: Created 7 years, 11 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 | « ash/wm/cursor_manager_unittest.cc ('k') | ash/wm/session_state_controller_impl2.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/session_state_controller_impl.cc
===================================================================
--- ash/wm/session_state_controller_impl.cc (revision 177177)
+++ ash/wm/session_state_controller_impl.cc (working copy)
@@ -52,7 +52,7 @@
shutting_down_ = true;
Shell* shell = ash::Shell::GetInstance();
shell->env_filter()->set_cursor_hidden_by_filter(false);
- shell->cursor_manager()->ShowCursor(false);
+ shell->cursor_manager()->DisableMouseEvents();
animator_->StartAnimation(
internal::SessionStateAnimator::kAllContainersMask,
internal::SessionStateAnimator::ANIMATION_HIDE_IMMEDIATELY,
@@ -219,7 +219,7 @@
Shell* shell = ash::Shell::GetInstance();
shell->env_filter()->set_cursor_hidden_by_filter(false);
- shell->cursor_manager()->ShowCursor(false);
+ shell->cursor_manager()->DisableMouseEvents();
if (login_status_ != user::LOGGED_IN_NONE) {
// Hide the other containers before starting the animation.
« no previous file with comments | « ash/wm/cursor_manager_unittest.cc ('k') | ash/wm/session_state_controller_impl2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698