diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 19:51:17 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 19:51:17 +0000 |
| commit | ffabb1ea75e662308da91e916a0ffc922525aa18 (patch) | |
| tree | 788b1ac84169a936b02d10feda6c94efaee129ea /ash/dip_unittest.cc | |
| parent | c856e976800426511cd1a0f74d38c1fa7c883018 (diff) | |
| download | chromium_src-ffabb1ea75e662308da91e916a0ffc922525aa18.zip chromium_src-ffabb1ea75e662308da91e916a0ffc922525aa18.tar.gz chromium_src-ffabb1ea75e662308da91e916a0ffc922525aa18.tar.bz2 | |
Makes gfx::Screen an instance, rather than a collection of static methods.
This is in support of supporting separate Screen implementations on Aura for desktop and metro on Windows.
Some callsites are not yet correct, and noted with a reference to the http://crbug.com/133312. As-is those sites will behave the same as before this patch, but may not be correct once desktop/metro can run simultaneously.
BUG=133312
Review URL: https://chromiumcodereview.appspot.com/11030017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/dip_unittest.cc')
| -rw-r--r-- | ash/dip_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ash/dip_unittest.cc b/ash/dip_unittest.cc index b710e4c..2a311d5 100644 --- a/ash/dip_unittest.cc +++ b/ash/dip_unittest.cc @@ -39,7 +39,8 @@ TEST_F(DIPTest, MAYBE_WorkArea) { ChangeDisplayConfig(1.0f, gfx::Rect(0, 0, 1000, 900)); aura::RootWindow* root = Shell::GetPrimaryRootWindow(); - const gfx::Display display = gfx::Screen::GetDisplayNearestWindow(root); + const gfx::Display display = + Shell::GetScreen()->GetDisplayNearestWindow(root); EXPECT_EQ("0,0 1000x900", display.bounds().ToString()); gfx::Rect work_area = display.work_area(); @@ -48,7 +49,8 @@ TEST_F(DIPTest, MAYBE_WorkArea) { ChangeDisplayConfig(2.0f, gfx::Rect(0, 0, 2000, 1800)); - const gfx::Display display_2x = gfx::Screen::GetDisplayNearestWindow(root); + const gfx::Display display_2x = + Shell::GetScreen()->GetDisplayNearestWindow(root); // The |bounds_in_pixel()| should report bounds in pixel coordinate. EXPECT_EQ("0,0 2000x1800", display_2x.bounds_in_pixel().ToString()); |