diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 23:34:50 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 23:34:50 +0000 |
| commit | 8039e06c060c94a67d8478bd81e2c0609c6b7b26 (patch) | |
| tree | d0e7f7b04a9fa21bd026978388781f82ce120ca7 /ash/screen_ash_unittest.cc | |
| parent | 6cdd707b95c519e342df380b5ee9d177f7965dd2 (diff) | |
| download | chromium_src-8039e06c060c94a67d8478bd81e2c0609c6b7b26.zip chromium_src-8039e06c060c94a67d8478bd81e2c0609c6b7b26.tar.gz chromium_src-8039e06c060c94a67d8478bd81e2c0609c6b7b26.tar.bz2 | |
Enable launcher on all displays by default
Updated tests to work on both environment. I did this so that
we can just flip the flag when we need to turn this off.
BUG=166119
TEST=some tests were updated to work under this environment.
Review URL: https://chromiumcodereview.appspot.com/11975019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/screen_ash_unittest.cc')
| -rw-r--r-- | ash/screen_ash_unittest.cc | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/ash/screen_ash_unittest.cc b/ash/screen_ash_unittest.cc index 2320877..cdc854a 100644 --- a/ash/screen_ash_unittest.cc +++ b/ash/screen_ash_unittest.cc @@ -36,9 +36,15 @@ TEST_F(ScreenAshTest, Bounds) { EXPECT_EQ("0,0 600x597", ScreenAsh::GetMaximizedWindowBoundsInParent( primary->GetNativeView()).ToString()); - EXPECT_EQ("0,0 500x500", - ScreenAsh::GetMaximizedWindowBoundsInParent( - secondary->GetNativeView()).ToString()); + if (Shell::IsLauncherPerDisplayEnabled()) { + EXPECT_EQ("0,0 500x452", + ScreenAsh::GetMaximizedWindowBoundsInParent( + secondary->GetNativeView()).ToString()); + } else { + EXPECT_EQ("0,0 500x500", + ScreenAsh::GetMaximizedWindowBoundsInParent( + secondary->GetNativeView()).ToString()); + } // Display bounds EXPECT_EQ("0,0 600x600", @@ -52,9 +58,15 @@ TEST_F(ScreenAshTest, Bounds) { EXPECT_EQ("0,0 600x597", ScreenAsh::GetDisplayWorkAreaBoundsInParent( primary->GetNativeView()).ToString()); - EXPECT_EQ("0,0 500x500", - ScreenAsh::GetDisplayWorkAreaBoundsInParent( - secondary->GetNativeView()).ToString()); + if (Shell::IsLauncherPerDisplayEnabled()) { + EXPECT_EQ("0,0 500x452", + ScreenAsh::GetDisplayWorkAreaBoundsInParent( + secondary->GetNativeView()).ToString()); + } else { + EXPECT_EQ("0,0 500x500", + ScreenAsh::GetDisplayWorkAreaBoundsInParent( + secondary->GetNativeView()).ToString()); + } } TEST_F(ScreenAshTest, ConvertRect) { |