diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-10 04:33:39 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-10 04:33:39 +0000 |
| commit | 8c0ec432f90e6056a62684ef73ff488a61fe84d2 (patch) | |
| tree | 17406995dffef2a3f91697bca8430afab712219b /ash/screen_ash_unittest.cc | |
| parent | 08f1e345d3d5d030a0e18179f0fe7667bc1a3aba (diff) | |
| download | chromium_src-8c0ec432f90e6056a62684ef73ff488a61fe84d2.zip chromium_src-8c0ec432f90e6056a62684ef73ff488a61fe84d2.tar.gz chromium_src-8c0ec432f90e6056a62684ef73ff488a61fe84d2.tar.bz2 | |
Remove ash-disable-launcher-per-display flag
BUG=239681
TEST=none
Review URL: https://chromiumcodereview.appspot.com/14584004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199368 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, 6 insertions, 18 deletions
diff --git a/ash/screen_ash_unittest.cc b/ash/screen_ash_unittest.cc index 7ef789b..71d608f 100644 --- a/ash/screen_ash_unittest.cc +++ b/ash/screen_ash_unittest.cc @@ -38,15 +38,9 @@ TEST_F(ScreenAshTest, Bounds) { EXPECT_EQ("0,0 600x597", ScreenAsh::GetMaximizedWindowBoundsInParent( primary->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()); - } + EXPECT_EQ("0,0 500x452", + ScreenAsh::GetMaximizedWindowBoundsInParent( + secondary->GetNativeView()).ToString()); // Display bounds EXPECT_EQ("0,0 600x600", @@ -60,15 +54,9 @@ TEST_F(ScreenAshTest, Bounds) { EXPECT_EQ("0,0 600x597", ScreenAsh::GetDisplayWorkAreaBoundsInParent( primary->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()); - } + EXPECT_EQ("0,0 500x452", + ScreenAsh::GetDisplayWorkAreaBoundsInParent( + secondary->GetNativeView()).ToString()); } // Test verifies a stable handling of secondary screen widget changes |