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

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 other os's 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
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..8064f55c195deeea84c3ba98bc1a98789f7aa5e1 100644
--- a/ash/wm/shelf_layout_manager.cc
+++ b/ash/wm/shelf_layout_manager.cc
@@ -879,8 +879,10 @@ ShelfLayoutManager::AutoHideState ShelfLayoutManager::CalculateAutoHideState(
-kNotificationBubbleGapHeight : 0,
0);
}
- return shelf_region.Contains(gfx::Screen::GetCursorScreenPoint()) ?
- AUTO_HIDE_SHOWN : AUTO_HIDE_HIDDEN;
+ return shelf_region.Contains(gfx::Screen::GetCursorScreenPoint(
+ ash::Shell::GetRootNativeView())) ?
+ AUTO_HIDE_SHOWN :
+ AUTO_HIDE_HIDDEN;
}
void ShelfLayoutManager::UpdateHitTestBounds() {

Powered by Google App Engine
This is Rietveld 408576698