diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 21:51:44 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 21:51:44 +0000 |
| commit | e72fa4d643005f438978d8a9c21272f3acd64061 (patch) | |
| tree | fabd135523ba0954c3c6b861dd21c5e165512580 /ash/dip_unittest.cc | |
| parent | f33386d952654acfad4f62029ece49f0e7ecb200 (diff) | |
| download | chromium_src-e72fa4d643005f438978d8a9c21272f3acd64061.zip chromium_src-e72fa4d643005f438978d8a9c21272f3acd64061.tar.gz chromium_src-e72fa4d643005f438978d8a9c21272f3acd64061.tar.bz2 | |
Revert r 144499 "Rename the remaining usage of Monitor to Display"
Temporarily reverting rename change to investigate 133784
TBR=oshima@chromium.org
BUG=123160
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10689014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144573 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 b710e4c..a6ebe14 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 display yet. +// Windows/Aura doesn't have DIP support in monitor 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) { - ChangeDisplayConfig(1.0f, gfx::Rect(0, 0, 1000, 900)); + ChangeMonitorConfig(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()); - ChangeDisplayConfig(2.0f, gfx::Rect(0, 0, 2000, 1800)); + ChangeMonitorConfig(2.0f, gfx::Rect(0, 0, 2000, 1800)); const gfx::Display display_2x = gfx::Screen::GetDisplayNearestWindow(root); |