Revert of Ash:Shelf - Cleanup of Alternate Shelf (part 1)

ash/ash_switches.cc

Index: ash/ash_switches.cc
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index 2a010d6e452be7acc421b9dadd83e58a9383ce0f..bde14fef7c9ea8c862e644faf3322b7124997935 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -148,6 +148,14 @@
 // 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[] =
@@ -171,6 +179,11 @@
       HasSwitch(kAshEnableAlternateFrameCaptionButtonStyle);
 }
 
+bool UseAlternateShelfLayout() {
+  return !CommandLine::ForCurrentProcess()->
+      HasSwitch(kAshDisableAlternateShelfLayout);
+}
+
 bool UseDragOffShelf() {
   return !CommandLine::ForCurrentProcess()->
       HasSwitch(kAshDisableDragOffShelf);