ash/wm/session_state_controller_impl2.cc - Issue 11956019: Merge 173933

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/session_state_controller_impl2.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:

Index: ash/wm/session_state_controller_impl2.cc

===================================================================

--- ash/wm/session_state_controller_impl2.cc (revision 177177)

+++ ash/wm/session_state_controller_impl2.cc (working copy)

@@ -171,7 +171,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,

@@ -279,7 +279,7 @@

Shell* shell = ash::Shell::GetInstance();

shell->env_filter()->set_cursor_hidden_by_filter(false);

- shell->cursor_manager()->ShowCursor(false);

+ shell->cursor_manager()->DisableMouseEvents();

StartShutdownAnimationImpl();

}

@@ -338,7 +338,7 @@

Shell* shell = ash::Shell::GetInstance();

shell->env_filter()->set_cursor_hidden_by_filter(false);

- shell->cursor_manager()->ShowCursor(false);

+ shell->cursor_manager()->DisableMouseEvents();

StartRealShutdownTimer(false);

}

« no previous file with comments | « ash/wm/session_state_controller_impl.cc ('k') | ash/wm/window_manager_unittest.cc » ('j') | no next file with comments »