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

ash/ash_switches.h

Index: ash/ash_switches.h
diff --git a/ash/ash_switches.h b/ash/ash_switches.h
index 6ced50e62c93b24b6adcf5cd88c40967e5d0dca5..8837061b158eb9cccbf3dda6029d42f054371740 100644
--- a/ash/ash_switches.h
+++ b/ash/ash_switches.h
@@ -56,6 +56,7 @@
 ASH_EXPORT extern const char kAshHostWindowBounds[];
 ASH_EXPORT extern const char kAshSecondaryDisplayLayout[];
 ASH_EXPORT extern const char kAshTouchHud[];
+ASH_EXPORT extern const char kAshUseAlternateShelfLayout[];
 ASH_EXPORT extern const char kAshUseFirstDisplayAsInternal[];
 ASH_EXPORT extern const char kAuraLegacyPowerButton[];
 #if defined(OS_WIN)
@@ -65,6 +66,9 @@
 // Returns true if the alternate visual style for the caption buttons (minimize,
 // maximize, restore, close) should be used.
 ASH_EXPORT bool UseAlternateFrameCaptionButtonStyle();
+
+// Returns true if the alternate shelf layout should be used.
+ASH_EXPORT bool UseAlternateShelfLayout();
 
 // Returns true if items can be dragged off the shelf to unpin.
 ASH_EXPORT bool UseDragOffShelf();