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

ash/ash_switches.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_ASH_SWITCHES_H_
 #define ASH_ASH_SWITCHES_H_
 
 #include "ash/ash_export.h"
 
 #include "build/build_config.h"
@@ skipping 38 matching lines @@
 ASH_EXPORT extern const char kAshEnableSoftwareMirroring[];
 ASH_EXPORT extern const char kAshEnableSystemSounds[];
 ASH_EXPORT extern const char kAshEnableTouchViewTesting[];
 ASH_EXPORT extern const char kAshEnableTrayDragging[];
 ASH_EXPORT extern const char kAshGuestWallpaperLarge[];
 ASH_EXPORT extern const char kAshGuestWallpaperSmall[];
 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)
 ASH_EXPORT extern const char kForceAshToDesktop[];
 #endif
 
 // 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();
 
 // Returns true if all windows (barring frameless apps) can be put into
 // immersive fullscreen via <F4>.
 ASH_EXPORT bool UseImmersiveFullscreenForAllWindows();
 
 // Returns true if multiple user icons are allowed in the tray.
 ASH_EXPORT bool UseMultiUserTray();
 
 // Returns true if overview mode should be activated for window switching.
 ASH_EXPORT bool UseOverviewMode();
 
 // Returns true if docked windows feature is enabled.
 ASH_EXPORT bool UseDockedWindows();
 
 // Returns true if we should show the audio device switching UI.
 ASH_EXPORT bool ShowAudioDeviceMenu();
 
 #if defined(OS_CHROMEOS)
 // Returns true if a notification should appear when a low-power USB charger
 // is connected.
 ASH_EXPORT bool UseUsbChargerNotification();
 #endif
 
 }  // namespace switches
 }  // namespace ash
 
 #endif  // ASH_ASH_SWITCHES_H_