diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-25 20:03:41 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-25 20:03:41 +0000 |
| commit | b82c42c45ee1b113377a2800b36d6e5e05b8b8e1 (patch) | |
| tree | 6034126ffc720a18cabc0bdb211de7ca10233670 /ui/aura/window_unittest.cc | |
| parent | ce8d264d556f06a4b46b58b95bc82a884bb315d0 (diff) | |
| download | chromium_src-b82c42c45ee1b113377a2800b36d6e5e05b8b8e1.zip chromium_src-b82c42c45ee1b113377a2800b36d6e5e05b8b8e1.tar.gz chromium_src-b82c42c45ee1b113377a2800b36d6e5e05b8b8e1.tar.bz2 | |
* Separated implementation class from gfx::Screen
* Moved Monitor class to gfx/.
* Converted all use of gfx::Screen to match new API
BUG=115347,111990
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9960042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/window_unittest.cc')
| -rw-r--r-- | ui/aura/window_unittest.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc index a3401f6..5a011d4 100644 --- a/ui/aura/window_unittest.cc +++ b/ui/aura/window_unittest.cc @@ -974,7 +974,7 @@ TEST_F(WindowTest, IgnoreEventsTest) { TEST_F(WindowTest, Transform) { gfx::Size size = root_window()->GetHostSize(); EXPECT_EQ(gfx::Rect(size), - gfx::Screen::GetMonitorAreaNearestPoint(gfx::Point())); + gfx::Screen::GetMonitorNearestPoint(gfx::Point()).bounds()); // Rotate it clock-wise 90 degrees. ui::Transform transform; @@ -986,8 +986,9 @@ TEST_F(WindowTest, Transform) { gfx::Size transformed_size(size.height(), size.width()); EXPECT_EQ(transformed_size.ToString(), root_window()->bounds().size().ToString()); - EXPECT_EQ(gfx::Rect(transformed_size).ToString(), - gfx::Screen::GetMonitorAreaNearestPoint(gfx::Point()).ToString()); + EXPECT_EQ( + gfx::Rect(transformed_size).ToString(), + gfx::Screen::GetMonitorNearestPoint(gfx::Point()).bounds().ToString()); // Host size shouldn't change. EXPECT_EQ(size.ToString(), |