Shelf Cleanup AlternateShelfLayout P1 Attempt 3

ash/ash_switches.cc

Index: ash/ash_switches.cc
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index a0e3975fa3f6a94c696d4e4c2b6bedc8d0eff90b..f6bfeda6f45760937ad15825b2a9954aced9d424 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -43,10 +43,6 @@ const char kAshDefaultWallpaperSmall[] = "ash-default-wallpaper-small";
 const char kAshDisableAlternateFrameCaptionButtonStyle[] =
     "ash-disable-alternate-caption-button";
 
-// Disable the alternate shelf layout.
-const char kAshDisableAlternateShelfLayout[] =
-    "ash-disable-alternate-shelf-layout";
-
 // Disable ability to dock windows at the desktop edge.
 const char kAshDisableDockedWindows[] = "ash-disable-docked-windows";
 
@@ -103,14 +99,6 @@ const char kAshSecondaryDisplayLayout[] = "ash-secondary-display-layout";
 // Enables the heads-up display for tracking touch points.
 const char kAshTouchHud[] = "ash-touch-hud";
 
-// Use alternate layout of the shelf for testing a new look and feel:
-// Slightly smaller profile, only 2 states for the "bar highlight" on
-// launcher buttons, app list icon with more visible state indication,
-// app list icon repositionable and defaulting as 1st item in shelf,
-// more visible state indication for background on status area.
-// crbug's [244983, 244990, 244994, 245005, 245012]
-const char kAshUseAlternateShelfLayout[] = "ash-use-alternate-shelf";
-
 // Uses the 1st display in --ash-host-window-bounds as internal display.
 // This is for debugging on linux desktop.
 const char kAshUseFirstDisplayAsInternal[] =
@@ -134,11 +122,6 @@ bool UseAlternateFrameCaptionButtonStyle() {
       HasSwitch(kAshDisableAlternateFrameCaptionButtonStyle);
 }
 
-bool UseAlternateShelfLayout() {
-  return !CommandLine::ForCurrentProcess()->
-      HasSwitch(kAshDisableAlternateShelfLayout);
-}
-
 bool UseDockedWindows() {
   return !CommandLine::ForCurrentProcess()->HasSwitch(kAshDisableDockedWindows);
 }