Shelf Cleanup AlternateShelfLayout P1 Attempt 3

ash/ash_switches.h

Index: ash/ash_switches.h
diff --git a/ash/ash_switches.h b/ash/ash_switches.h
index 829ee96720faa28c64ebf21558a4ba1d47f10cbd..6b1e01f2496279b9d7ffe1a6a35864162c27cfa1 100644
--- a/ash/ash_switches.h
+++ b/ash/ash_switches.h
@@ -25,7 +25,6 @@ ASH_EXPORT extern const char kAshDefaultWallpaperIsOem[];
 ASH_EXPORT extern const char kAshDefaultWallpaperLarge[];
 ASH_EXPORT extern const char kAshDefaultWallpaperSmall[];
 ASH_EXPORT extern const char kAshDisableAlternateFrameCaptionButtonStyle[];
-ASH_EXPORT extern const char kAshDisableAlternateShelfLayout[];
 ASH_EXPORT extern const char kAshDisableDockedWindows[];
 ASH_EXPORT extern const char kAshEnableAlternateFrameCaptionButtonStyle[];
 #if defined(OS_CHROMEOS)
@@ -42,7 +41,6 @@ ASH_EXPORT extern const char kAshHideNotificationsForFactory[];
 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)
@@ -53,9 +51,6 @@ ASH_EXPORT extern const char kForceAshToDesktop[];
 // 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();