ash/wm/session_state_controller_impl2.cc - Issue 11412315: Make the cursor have separate mode for disabled mouse events and invisible.

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 11412315: Make the cursor have separate mode for disabled mouse events and invisible. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix win_aura Created 8 years 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

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 ed72af5b5ec7b6c7914384737b416876deff77c8..9bc8e9d40766d551b75fbf82503299547df96268 100644

--- a/ash/wm/session_state_controller_impl2.cc

+++ b/ash/wm/session_state_controller_impl2.cc

@@ -169,7 +169,7 @@ void SessionStateControllerImpl2::OnAppTerminating() {

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,

@@ -277,7 +277,7 @@ void SessionStateControllerImpl2::RequestShutdownImpl() {

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

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

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

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

StartShutdownAnimationImpl();

}

@@ -336,7 +336,7 @@ void SessionStateControllerImpl2::OnPreShutdownAnimationTimeout() {

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 »