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

Unified Diff: ui/gfx/screen_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: mac compile fix 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: ui/gfx/screen_unittest.cc
diff --git a/ui/gfx/screen_unittest.cc b/ui/gfx/screen_unittest.cc
index d09f2db8a4a0ad12ab1e043bb3ea70491cf9883c..d16eaa01533daf6938843d800323437702d0bfb2 100644
--- a/ui/gfx/screen_unittest.cc
+++ b/ui/gfx/screen_unittest.cc
@@ -10,14 +10,15 @@ namespace {
TEST(ScreenTest, GetPrimaryDisplaySize) {
// We aren't actually testing that it's correct, just that it's sane.
- const gfx::Size size = gfx::Screen::GetPrimaryDisplay().size();
+ const gfx::Size size = gfx::Screen::GetPrimaryDisplay(
+ gfx::Screen::BadTwoWorldsContext()).size();
EXPECT_GE(size.width(), 1);
EXPECT_GE(size.height(), 1);
}
TEST(ScreenTest, GetNumDisplays) {
// We aren't actually testing that it's correct, just that it's sane.
- EXPECT_GE(gfx::Screen::GetNumDisplays(), 1);
+ EXPECT_GE(gfx::Screen::GetNumDisplays(gfx::Screen::BadTwoWorldsContext()), 1);
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698