commit 8c0ec432f90e6056a62684ef73ff488a61fe84d2
author oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri May 10 04:33:39 2013
committer oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri May 10 04:33:39 2013
tree 17406995dffef2a3f91697bca8430afab712219b
parent 08f1e345d3d5d030a0e18179f0fe7667bc1a3aba

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

ash/root_window_controller_unittest.cc

diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index 55b3ed2..b33e012 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -144,15 +144,9 @@
   views::Widget* maximized = CreateTestWidget(gfx::Rect(700, 10, 100, 100));
   maximized->Maximize();
   EXPECT_EQ(root_windows[1], maximized->GetNativeView()->GetRootWindow());
-  if (Shell::IsLauncherPerDisplayEnabled()) {
-    EXPECT_EQ("600,0 500x452", maximized->GetWindowBoundsInScreen().ToString());
-    EXPECT_EQ("0,0 500x452",
-              maximized->GetNativeView()->GetBoundsInRootWindow().ToString());
-  } else {
-    EXPECT_EQ("600,0 500x500", maximized->GetWindowBoundsInScreen().ToString());
-    EXPECT_EQ("0,0 500x500",
-              maximized->GetNativeView()->GetBoundsInRootWindow().ToString());
-  }
+  EXPECT_EQ("600,0 500x452", maximized->GetWindowBoundsInScreen().ToString());
+  EXPECT_EQ("0,0 500x452",
+            maximized->GetNativeView()->GetBoundsInRootWindow().ToString());
 
   views::Widget* minimized = CreateTestWidget(gfx::Rect(800, 10, 100, 100));
   minimized->Minimize();