Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1994)

Issues Search
    My Issues | Starred     Open | Closed | All

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 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
« ash/system/tray/system_tray.cc ('K') | « ash/wm/frame_painter.cc ('k') | ash/wm/gestures/bezel_gesture_handler.cc » ('j') | ash/wm/shelf_layout_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..fae1e93f241dfdc65e65b914a5cea31105740333 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::GetAshScreen()->GetDisplayMatching(
+ any_rect).work_area();
w1->SetBounds(any_rect);
EXPECT_EQ(HTTOPLEFT, p1.NonClientHitTest(frame, gfx::Point(0, 15)));
w1->SetBounds(gfx::Rect(
« ash/system/tray/system_tray.cc ('K') | « ash/wm/frame_painter.cc ('k') | ash/wm/gestures/bezel_gesture_handler.cc » ('j') | ash/wm/shelf_layout_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698