From fda64c9e1866aff130c885c54431ee6b7d011788 Mon Sep 17 00:00:00 2001 From: "jennyz@chromium.org" Date: Wed, 12 Mar 2014 21:45:32 +0000 Subject: Revert of Shelf Cleanup (- binary files) (https://codereview.chromium.org/176883022/) Reason for revert: This cl is breaking the app list launch bubble. see crbug.com/351776. Original issue's description: > Shelf Cleanup (- binary files) > > R=skuhne@chromium.org > TBR=jamescook@chromium.org, miket@chromium.org, skuhne@chromium.org > BUG=338429 > > re-landing of > https://codereview.chromium.org/140323010/ hopefully this time with less breaking everything. > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256319 TBR=jamescook@chromium.org,skuhne@chromium.org,harrym@chromium.org NOTREECHECKS=true NOTRY=true BUG=338429 Review URL: https://codereview.chromium.org/198063003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256662 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/ash_switches.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ash/ash_switches.h') diff --git a/ash/ash_switches.h b/ash/ash_switches.h index 198d436..7dae4e0 100644 --- a/ash/ash_switches.h +++ b/ash/ash_switches.h @@ -25,11 +25,7 @@ ASH_EXPORT extern const char kAshDefaultWallpaperIsOem[]; ASH_EXPORT extern const char kAshDefaultWallpaperLarge[]; ASH_EXPORT extern const char kAshDefaultWallpaperSmall[]; ASH_EXPORT extern const char kAshDisableAlternateFrameCaptionButtonStyle[]; - -#if defined(OS_CHROMEOS) -ASH_EXPORT extern const char kAshDisableAudioDeviceMenu[]; -#endif - +ASH_EXPORT extern const char kAshDisableAlternateShelfLayout[]; ASH_EXPORT extern const char kAshDisableDockedWindows[]; ASH_EXPORT extern const char kAshEnableAlternateFrameCaptionButtonStyle[]; ASH_EXPORT extern const char kAshEnableBrightnessControl[]; @@ -49,6 +45,7 @@ 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) @@ -59,6 +56,9 @@ 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(); -- cgit v1.1