summaryrefslogtreecommitdiffstats
path: root/ash/screen_ash_unittest.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-01 02:17:55 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-01 02:17:55 +0000
commitb49c0117dde28ea3745b9774042e61703d10822d (patch)
tree42e2940f9d1c8f453a63d7e16efefe2a745fc1cf /ash/screen_ash_unittest.cc
parent8e7bed1e9d453e808b32c446c58fc29b823ceacd (diff)
downloadchromium_src-b49c0117dde28ea3745b9774042e61703d10822d.zip
chromium_src-b49c0117dde28ea3745b9774042e61703d10822d.tar.gz
chromium_src-b49c0117dde28ea3745b9774042e61703d10822d.tar.bz2
Revert "Use WS_POPUP for ash_unittests"
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. TBR=oshima@chromium.org BUG=150986, 157817, 141577, 148691 TEST=none Review URL: https://codereview.chromium.org/11419271 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170632 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/screen_ash_unittest.cc')
-rw-r--r--ash/screen_ash_unittest.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/screen_ash_unittest.cc b/ash/screen_ash_unittest.cc
index 79e5627..0fc71a6 100644
--- a/ash/screen_ash_unittest.cc
+++ b/ash/screen_ash_unittest.cc
@@ -20,6 +20,7 @@ namespace test {
typedef test::AshTestBase ScreenAshTest;
+#if !defined(OS_WIN)
TEST_F(ScreenAshTest, Bounds) {
UpdateDisplay("600x600,500x500");
Shell::GetPrimaryRootWindowController()->SetShelfAutoHideBehavior(
@@ -56,6 +57,7 @@ TEST_F(ScreenAshTest, Bounds) {
ScreenAsh::GetDisplayWorkAreaBoundsInParent(
secondary->GetNativeView()).ToString());
}
+#endif
TEST_F(ScreenAshTest, ConvertRect) {
UpdateDisplay("600x600,500x500");