chrome/browser/ui/views/ash/window_positioner.cc - Issue 10540123: Rename gfx::Screen::GetMonitorXXXX to gfx::Screen::GetDisplayXXX.

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/ash/window_positioner.cc

Issue 10540123: Rename gfx::Screen::GetMonitorXXXX to gfx::Screen::GetDisplayXXX. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 6 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:

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

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

index f84dfe3b000217e00a2e86dfbdad4f906d3d019c..3e73c6d5f25cbd746135a1a01144d727fe5ae2fd 100644

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

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

@@ -48,8 +48,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::GetMonitorNearestWindow(window).work_area() :

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

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

+ gfx::Screen::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 >=