Part 1) of cleaning up the code related to the shelf layout, specifically removing all instances of branching related to the 'alternate shelf layout' as this is now the only option.

Removed the about:flags entry relating to alternate shelf layout.

A patch will follow to simplify the remaining layout code as it is still a bit of a spaghetti like mess.

R=jamescook@chromium.org, skuhne@chromium.org
TBR=miket@chromium.org
BUG=338429

Review URL: https://codereview.chromium.org/140323010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254301 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 39 deletions

diff --git a/ash/dip_unittest.cc b/ash/dip_unittest.cc
index 5fef468..2c15765 100644
--- a/ash/dip_unittest.cc
+++ b/ash/dip_unittest.cc
@@ -69,43 +69,4 @@ TEST_F(DIPTest, WorkArea) {
       shelf->shelf_widget()->GetNativeView()->layer()->bounds().height());
 }
 
-TEST_F(DIPTest, WorkAreaForLegacyShelfLayout) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      ash::switches::kAshDisableAlternateShelfLayout);
-  UpdateDisplay("1000x900*1.0f");
-
-  aura::Window* root = Shell::GetPrimaryRootWindow();
-  const gfx::Display display =
-      Shell::GetScreen()->GetDisplayNearestWindow(root);
-
-  EXPECT_EQ("0,0 1000x900", display.bounds().ToString());
-  gfx::Rect work_area = display.work_area();
-  EXPECT_EQ("0,0 1000x852", work_area.ToString());
-  EXPECT_EQ("0,0,48,0", display.bounds().InsetsFrom(work_area).ToString());
-
-  UpdateDisplay("2000x1800*2.0f");
-  gfx::Screen* screen = Shell::GetScreen();
-
-  const gfx::Display display_2x = screen->GetDisplayNearestWindow(root);
-  const internal::DisplayInfo display_info_2x =
-      Shell::GetInstance()->display_manager()->GetDisplayInfo(display_2x.id());
-
-  // The |bounds_in_native()| should report bounds in pixel coordinate.
-  EXPECT_EQ("1,1 2000x1800",
-            display_info_2x.bounds_in_native().ToString());
-
-  // Aura and views coordinates are in DIP, so they their bounds do not change.
-  EXPECT_EQ("0,0 1000x900", display_2x.bounds().ToString());
-  work_area = display_2x.work_area();
-  EXPECT_EQ("0,0 1000x852", work_area.ToString());
-  EXPECT_EQ("0,0,48,0", display_2x.bounds().InsetsFrom(work_area).ToString());
-
-  // Sanity check if the workarea's inset hight is same as
-  // the shelf's height.
-  Shelf* shelf = Shelf::ForPrimaryDisplay();
-  EXPECT_EQ(
-      display_2x.bounds().InsetsFrom(work_area).height(),
-      shelf->shelf_widget()->GetNativeView()->layer()->bounds().height());
-}
-
 }  // namespace ash