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

Unified Diff: ash/wm/window_manager_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
Index: ash/wm/window_manager_unittest.cc
diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc
index b99bbb841bd58effd0fd5f40d0d4f4d425ea3843..a84713898588548380fe7784cd1b8f42e018747b 100644
--- a/ash/wm/window_manager_unittest.cc
+++ b/ash/wm/window_manager_unittest.cc
@@ -466,7 +466,8 @@ TEST_F(WindowManagerTest, MAYBE_TransformActivate) {
gfx::Size size = root_window->bounds().size();
EXPECT_EQ(
gfx::Rect(size).ToString(),
- gfx::Screen::GetDisplayNearestPoint(gfx::Point()).bounds().ToString());
+ Shell::GetAshScreen()->GetDisplayNearestPoint(
+ gfx::Point()).bounds().ToString());
// Rotate it clock-wise 90 degrees.
ui::Transform transform;

Powered by Google App Engine
This is Rietveld 408576698