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

Unified Diff: chrome/browser/ui/views/app_list/app_list_controller_win.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: non-aura fix 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: chrome/browser/ui/views/app_list/app_list_controller_win.cc
diff --git a/chrome/browser/ui/views/app_list/app_list_controller_win.cc b/chrome/browser/ui/views/app_list/app_list_controller_win.cc
index c4b0e51f86f858f2a70e203ceb2f18ad15c2ace0..a5ddc0da5eb949589bbc7efb92f237ddd3b67ce6 100644
--- a/chrome/browser/ui/views/app_list/app_list_controller_win.cc
+++ b/chrome/browser/ui/views/app_list/app_list_controller_win.cc
@@ -173,7 +173,8 @@ void UpdateArrowPositionAndAnchorPoint(app_list::AppListView* view) {
int min_space_y = preferred.height() + kAnchorOffset + kPadding + kArrowSize;
gfx::Point anchor = view->anchor_point();
- gfx::Display display = gfx::Screen::GetDisplayNearestPoint(anchor);
+ gfx::Display display = gfx::Screen::GetScreenFor(
+ view->GetWidget()->GetNativeView())->GetDisplayNearestPoint(anchor);
const gfx::Rect& display_rect = display.work_area();
views::BubbleBorder::ArrowLocation arrow;
GetArrowLocationAndUpdateAnchor(display.work_area(),
@@ -237,7 +238,7 @@ void ShowAppList() {
// owned by the app list view. The app list view manages it's own lifetime.
app_list::AppListView* view = new app_list::AppListView(
new AppListViewDelegate(new AppListControllerWin()));
- gfx::Point cursor = gfx::Screen::GetCursorScreenPoint();
+ gfx::Point cursor = gfx::Screen::GetNativeScreen()->GetCursorScreenPoint();
view->InitAsBubble(
GetDesktopWindow(),
g_app_list_resources.Get().pagination_model(),

Powered by Google App Engine
This is Rietveld 408576698