chrome/browser/ui/ash/window_positioner.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/ash/window_positioner.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

« chrome/browser/ui/ash/ash_util.cc ('K') | « chrome/browser/ui/ash/ash_util.cc ('k') | chrome/browser/ui/ash/window_positioner_unittest.cc » ('j') | chrome/browser/ui/panels/display_settings_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/window_positioner.cc

diff --git a/chrome/browser/ui/ash/window_positioner.cc b/chrome/browser/ui/ash/window_positioner.cc

index e2e196871ee196b1d2cb9f6e94b6b2b271b9e6f7..d3be675be2e607c7b13d6c26af88caa2b7f36ff7 100644

--- a/chrome/browser/ui/ash/window_positioner.cc

+++ b/chrome/browser/ui/ash/window_positioner.cc

@@ -47,8 +47,8 @@ gfx::Rect WindowPositioner::GetPopupPosition(const gfx::Rect& old_pos) {

// work area.

aura::Window* window = ash::wm::GetActiveWindow();

const gfx::Rect work_area = window && window->IsVisible() ?

- gfx::Screen::GetDisplayNearestWindow(window).work_area() :

- gfx::Screen::GetPrimaryDisplay().work_area();

+ Shell::GetAshScreen()->GetDisplayNearestWindow(window).work_area() :

+ Shell::GetAshScreen()->GetPrimaryDisplay().work_area();

// Only try to reposition the popup when it is not spanning the entire

// screen.

if ((old_pos.width() + popup_position_offset_from_screen_corner_x >=