Revert of Shelf Cleanup (- binary files)

ash/ash_switches.cc

Index: ash/ash_switches.cc
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index 6bd34cb72a04501a783d5e21619ef9a188ed4aed..cd057dc23b097e122c85c6df2f888c6406880cf6 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -43,12 +43,9 @@
 const char kAshDisableAlternateFrameCaptionButtonStyle[] =
     "ash-disable-alternate-caption-button";
 
-#if defined(OS_CHROMEOS)
-// Disable the status tray volume menu for allowing the user to choose an audio
-// input and output device.
-const char kAshDisableAudioDeviceMenu[] =
-    "ash-disable-audio-device-menu";
-#endif
+// 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";
@@ -123,6 +120,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[] =
@@ -146,6 +151,11 @@
       HasSwitch(kAshDisableAlternateFrameCaptionButtonStyle);
 }
 
+bool UseAlternateShelfLayout() {
+  return !CommandLine::ForCurrentProcess()->
+      HasSwitch(kAshDisableAlternateShelfLayout);
+}
+
 bool UseImmersiveFullscreenForAllWindows() {
   return !CommandLine::ForCurrentProcess()->HasSwitch(
       kAshEnableImmersiveFullscreenForBrowserOnly);