diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 22:21:47 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 22:21:47 +0000 |
| commit | 2e236a564aa06711455408a2b13ac8f52ac79343 (patch) | |
| tree | 04478bff847bfd8b6d90437bf79f41a5caf0b398 /ash/dip_unittest.cc | |
| parent | 56827e84ada3c06d8533e01d2fa739f0cb432fa8 (diff) | |
| download | chromium_src-2e236a564aa06711455408a2b13ac8f52ac79343.zip chromium_src-2e236a564aa06711455408a2b13ac8f52ac79343.tar.gz chromium_src-2e236a564aa06711455408a2b13ac8f52ac79343.tar.bz2 | |
Relanding r144499:
Rename the remaining usage of Monitor to Display
BUG=none
TEST=none
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=144499
Review URL: https://chromiumcodereview.appspot.com/10675011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144585 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/dip_unittest.cc')
| -rw-r--r-- | ash/dip_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/dip_unittest.cc b/ash/dip_unittest.cc index a6ebe14..b710e4c 100644 --- a/ash/dip_unittest.cc +++ b/ash/dip_unittest.cc @@ -28,7 +28,7 @@ namespace ash { typedef ash::test::AshTestBase DIPTest; #if defined(OS_WIN) -// Windows/Aura doesn't have DIP support in monitor yet. +// Windows/Aura doesn't have DIP support in display yet. #define MAYBE_WorkArea DISABLED_WorkArea #else #define MAYBE_WorkArea WorkArea @@ -36,7 +36,7 @@ typedef ash::test::AshTestBase DIPTest; // Test if the WM sets correct work area under different density. TEST_F(DIPTest, MAYBE_WorkArea) { - ChangeMonitorConfig(1.0f, gfx::Rect(0, 0, 1000, 900)); + ChangeDisplayConfig(1.0f, gfx::Rect(0, 0, 1000, 900)); aura::RootWindow* root = Shell::GetPrimaryRootWindow(); const gfx::Display display = gfx::Screen::GetDisplayNearestWindow(root); @@ -46,7 +46,7 @@ TEST_F(DIPTest, MAYBE_WorkArea) { EXPECT_EQ("0,0 1000x852", work_area.ToString()); EXPECT_EQ("0,0,48,0", display.bounds().InsetsFrom(work_area).ToString()); - ChangeMonitorConfig(2.0f, gfx::Rect(0, 0, 2000, 1800)); + ChangeDisplayConfig(2.0f, gfx::Rect(0, 0, 2000, 1800)); const gfx::Display display_2x = gfx::Screen::GetDisplayNearestWindow(root); |