ash/wm/shelf_layout_manager.cc - Issue 11117012: ash: Fix event processing in modal windows in login/lock screen.

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/shelf_layout_manager.cc

Issue 11117012: ash: Fix event processing in modal windows in login/lock screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 2 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/shelf_layout_manager.cc

diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc

index 46023ccb3abe65758c96947a0196fc13f4deaae8..9afbfc0412eac9500adc5bfe648be130da89ab44 100644

--- a/ash/wm/shelf_layout_manager.cc

+++ b/ash/wm/shelf_layout_manager.cc

@@ -867,7 +867,8 @@ ShelfLayoutManager::AutoHideState ShelfLayoutManager::CalculateAutoHideState(

return AUTO_HIDE_HIDDEN;

gfx::Rect shelf_region = launcher_widget()->GetWindowBoundsInScreen();

- if (Shell::GetInstance()->status_area_widget()->IsMessageBubbleShown() &&

+ if (shell->status_area_widget() &&

+ shell->status_area_widget()->IsMessageBubbleShown() &&

IsVisible()) {

// Increase the the hit test area to prevent the shelf from disappearing

// when the mouse is over the bubble gap.