summaryrefslogtreecommitdiffstats
path: root/ui/aura/window_unittest.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-16 20:56:28 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-16 20:56:28 +0000
commit193b39d2ef3ec7a4f1692fd4448c515c06bb46d1 (patch)
treeb35587f06293535725508764137b06c6c413c5ff /ui/aura/window_unittest.cc
parent911cbcdade8c9386b68e3ee87cb9c2ea1c48db8e (diff)
downloadchromium_src-193b39d2ef3ec7a4f1692fd4448c515c06bb46d1.zip
chromium_src-193b39d2ef3ec7a4f1692fd4448c515c06bb46d1.tar.gz
chromium_src-193b39d2ef3ec7a4f1692fd4448c515c06bb46d1.tar.bz2
Native bounds support to host windows.
* Moved SingleMonitorManager into separate file. This is a default MonitorManager and creates RootWindow for PrimaryMonitor. * Added MonitorObserver and moved monitor change logic to ash. * MultiMonitorManager class and its layout logic will live in ash too. * Added ability to move host window so that we can re-arrange root window when switching primary monitor. * Removed monitor_manager_x11, which I committed by accident. * Use (0,0) for monitor/workarea bounds because the coordinate isn't translated yet for non primary screens. BUG=115510 TEST=none Review URL: https://chromiumcodereview.appspot.com/9703083 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127231 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/window_unittest.cc')
-rw-r--r--ui/aura/window_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index b2cb6715..c55e534 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -906,8 +906,8 @@ TEST_F(WindowTest, Transform) {
gfx::Size transformed_size(size.height(), size.width());
EXPECT_EQ(transformed_size.ToString(),
root_window()->GetHostSize().ToString());
- EXPECT_EQ(gfx::Rect(transformed_size).ToString(),
- root_window()->bounds().ToString());
+ EXPECT_EQ(transformed_size.ToString(),
+ root_window()->bounds().size().ToString());
EXPECT_EQ(gfx::Rect(transformed_size).ToString(),
gfx::Screen::GetMonitorAreaNearestPoint(gfx::Point()).ToString());
}