Index: ash/ash_switches.h |
diff --git a/ash/ash_switches.h b/ash/ash_switches.h |
index 7cae7aa45282fc73f19f99961cf3c93fa259c654..c62c73a9ba4019f38b5d4d1867f35af2affec11d 100644 |
--- a/ash/ash_switches.h |
+++ b/ash/ash_switches.h |
@@ -25,7 +25,11 @@ 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[]; |
+ |
+#if defined(OS_CHROMEOS) |
+ASH_EXPORT extern const char kAshDisableAudioDeviceMenu[]; |
+#endif |
+ |
ASH_EXPORT extern const char kAshDisableDockedWindows[]; |
ASH_EXPORT extern const char kAshDisableOverviewMode[]; |
ASH_EXPORT extern const char kAshEnableAdvancedGestures[]; |
@@ -47,7 +51,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) |
@@ -58,9 +61,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(); |