ash/wm/frame_painter_unittest.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_unittest.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_unittest.cc

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

index ab575bc9bbe20abfda977dc590bafc10db9d4205..8ce42eb8564e8099a09c2cc278a67ddce23e7190 100644

--- a/ash/wm/frame_painter_unittest.cc

+++ b/ash/wm/frame_painter_unittest.cc

@@ -336,7 +336,8 @@ TEST_F(FramePainterTest, HitTestSpecialMaximizedModes) {

views::NonClientFrameView* frame = w1->non_client_view()->frame_view();

w1->Show();

gfx::Rect any_rect = gfx::Rect(0, 0, 100, 100);

- gfx::Rect screen = gfx::Screen::GetDisplayMatching(any_rect).work_area();

+ gfx::Rect screen = Shell::GetScreen()->GetDisplayMatching(

+ any_rect).work_area();

w1->SetBounds(any_rect);

EXPECT_EQ(HTTOPLEFT, p1.NonClientHitTest(frame, gfx::Point(0, 15)));

w1->SetBounds(gfx::Rect(

« no previous file with comments | « ash/wm/frame_painter.cc ('k') | ash/wm/gestures/bezel_gesture_handler.cc » ('j') | no next file with comments »