ash/wm/shelf_layout_manager.cc - Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash

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 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix some new gfx::Screen additions 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:

View side-by-side diff with in-line comments

Download patch

« ash/system/tray/system_tray.cc ('K') | « ash/wm/maximize_bubble_controller.cc ('k') | ash/wm/shelf_layout_manager_unittest.cc » ('j') | chrome/browser/chromeos/extensions/wallpaper_manager_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..77a48641d0741b8c9d757876e2c9396a977f5013 100644

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

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

@@ -879,8 +879,9 @@ ShelfLayoutManager::AutoHideState ShelfLayoutManager::CalculateAutoHideState(

-kNotificationBubbleGapHeight : 0,

0);

}

- return shelf_region.Contains(gfx::Screen::GetCursorScreenPoint()) ?

- AUTO_HIDE_SHOWN : AUTO_HIDE_HIDDEN;

+ return shelf_region.Contains(Shell::GetAshScreen()->GetCursorScreenPoint()) ?

+ AUTO_HIDE_SHOWN :

+ AUTO_HIDE_HIDDEN;

oshima 2012/10/10 17:58:23 I slightly prefer the original format, but I'll le

scottmg 2012/10/10 19:04:47 Done.

}

void ShelfLayoutManager::UpdateHitTestBounds() {