ash/wm/frame_painter.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: ash/wm/frame_painter.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 new addition 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/frame_painter.cc

diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc

index 12d74dce820876d993712cc100e803e931561301..1f77072d27f66c061ee5cba39fb61d2431b2fd6a 100644

--- a/ash/wm/frame_painter.cc

+++ b/ash/wm/frame_painter.cc

@@ -674,7 +674,7 @@ int FramePainter::AdjustFrameHitCodeForMaximizedModes(int hit_code) {

// be active.

const gfx::Rect& bounds = frame_->GetWindowBoundsInScreen();

const gfx::Rect& screen =

- gfx::Screen::GetDisplayMatching(bounds).work_area();

+ Shell::GetScreen()->GetDisplayMatching(bounds).work_area();

if (bounds.y() == screen.y() && bounds.bottom() == screen.bottom()) {

// The window is probably either left or right maximized.

if (bounds.x() == screen.x()) {

« no previous file with comments | « ash/wm/coordinate_conversion.cc ('k') | ash/wm/frame_painter_unittest.cc » ('j') | no next file with comments »