summaryrefslogtreecommitdiffstats
path: root/ash/dip_unittest.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-01 01:48:45 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-01 01:48:45 +0000
commit52a49920649f6a29d17dc91b7101ff82b9a2ba96 (patch)
tree8e1b6b067018b19fb78669ae6c9d53725feefa63 /ash/dip_unittest.cc
parent7c083e491d5ce120b2864ae767230f56c55d3876 (diff)
downloadchromium_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/dip_unittest.cc')
-rw-r--r--ash/dip_unittest.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/ash/dip_unittest.cc b/ash/dip_unittest.cc
index 84b230d..1df1ec7 100644
--- a/ash/dip_unittest.cc
+++ b/ash/dip_unittest.cc
@@ -27,15 +27,8 @@ namespace ash {
typedef ash::test::AshTestBase DIPTest;
-#if defined(OS_WIN)
-// Windows/Aura doesn't have DIP support in display yet.
-#define MAYBE_WorkArea DISABLED_WorkArea
-#else
-#define MAYBE_WorkArea WorkArea
-#endif
-
// Test if the WM sets correct work area under different density.
-TEST_F(DIPTest, MAYBE_WorkArea) {
+TEST_F(DIPTest, WorkArea) {
ChangeDisplayConfig(1.0f, gfx::Rect(0, 0, 1000, 900));
aura::RootWindow* root = Shell::GetPrimaryRootWindow();