diff options
author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-01 01:48:45 +0000 |
---|---|---|
committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-01 01:48:45 +0000 |
commit | 52a49920649f6a29d17dc91b7101ff82b9a2ba96 (patch) | |
tree | 8e1b6b067018b19fb78669ae6c9d53725feefa63 /ash/root_window_controller_unittest.cc | |
parent | 7c083e491d5ce120b2864ae767230f56c55d3876 (diff) | |
download | chromium_src-52a49920649f6a29d17dc91b7101ff82b9a2ba96.zip chromium_src-52a49920649f6a29d17dc91b7101ff82b9a2ba96.tar.gz chromium_src-52a49920649f6a29d17dc91b7101ff82b9a2ba96.tar.bz2 |
Use WS_POPUP for ash_unittests
- Layout test windows starting from (1,1) and move
mouse to (0,0) so that they don't overlap unless
test moves the cursor.
- Enabled disabled tests.
- RootWindowHostWin::SetBounds should move the window
and call OnHostResized when the scale factor has changed.
This also seems to fix the desktop size limitation issue (148691)
probably because a popup window can be larger than the desktop size.
BUG=150986,157817,141577,148691
TEST=none
Review URL: https://chromiumcodereview.appspot.com/11428066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller_unittest.cc')
-rw-r--r-- | ash/root_window_controller_unittest.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc index a1f3c3e..e8f5763 100644 --- a/ash/root_window_controller_unittest.cc +++ b/ash/root_window_controller_unittest.cc @@ -119,12 +119,10 @@ TEST_F(RootWindowControllerTest, MoveWindows_Basic) { views::Widget* maximized = CreateTestWidget(gfx::Rect(700, 10, 100, 100)); maximized->Maximize(); EXPECT_EQ(root_windows[1], maximized->GetNativeView()->GetRootWindow()); -#if !defined(OS_WIN) - // TODO(oshima): Window reports smaller screen size. Investigate why. + EXPECT_EQ("600,0 500x500", maximized->GetWindowBoundsInScreen().ToString()); EXPECT_EQ("0,0 500x500", maximized->GetNativeView()->GetBoundsInRootWindow().ToString()); -#endif views::Widget* minimized = CreateTestWidget(gfx::Rect(800, 10, 100, 100)); minimized->Minimize(); @@ -135,13 +133,11 @@ TEST_F(RootWindowControllerTest, MoveWindows_Basic) { views::Widget* fullscreen = CreateTestWidget(gfx::Rect(900, 10, 100, 100)); fullscreen->SetFullscreen(true); EXPECT_EQ(root_windows[1], fullscreen->GetNativeView()->GetRootWindow()); -#if !defined(OS_WIN) - // TODO(oshima): Window reports smaller screen size. Investigate why. + EXPECT_EQ("600,0 500x500", fullscreen->GetWindowBoundsInScreen().ToString()); EXPECT_EQ("0,0 500x500", fullscreen->GetNativeView()->GetBoundsInRootWindow().ToString()); -#endif // Make sure a window that will delete itself when losing focus // will not crash. |