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

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: 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: tidy 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/display/display_controller.cc ('K') | « chrome/browser/ui/views/accelerator_table.cc ('k') | chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 10b3435c4b6f80ddc508a8054b8a64ed747a3f51..dc0726dab302bcf59326056f94feb586e34508bf 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

@@ -153,7 +153,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::GetDisplayNearestPoint(

+ gfx::Screen::BadTwoWorldsContext(), anchor);

const gfx::Rect& display_rect = display.work_area();

views::BubbleBorder::ArrowLocation arrow;

GetArrowLocationAndUpdateAnchor(display.work_area(),