diff options
| author | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-05 01:09:02 +0000 |
|---|---|---|
| committer | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-05 01:09:02 +0000 |
| commit | f54effec70d277cdafeb4199171ceb8290ded068 (patch) | |
| tree | 3e151ce06c782ef37b2c3400558a8f88c83e1aa8 /ash/ash_switches.cc | |
| parent | e6a1b4ee5411faaf44a95204299e9738bffc8a80 (diff) | |
| download | chromium_src-f54effec70d277cdafeb4199171ceb8290ded068.zip chromium_src-f54effec70d277cdafeb4199171ceb8290ded068.tar.gz chromium_src-f54effec70d277cdafeb4199171ceb8290ded068.tar.bz2 | |
ash:Shelf - Enable Alternate Shelf and Side Shelf by default.
Updated and/or duplicated (updated with copy renamed *ForLegacyShelfLayout) unit tests as required.
BUG=246279
TBR=jamescook@chromium.org, skuhne@chromium.org
Review URL: https://codereview.chromium.org/22793011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash_switches.cc')
| -rw-r--r-- | ash/ash_switches.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc index 33d3672..b70c6f9 100644 --- a/ash/ash_switches.cc +++ b/ash/ash_switches.cc @@ -44,6 +44,10 @@ const char kAshDefaultGuestWallpaperSmall[] = const char kAshDefaultWallpaperLarge[] = "ash-default-wallpaper-large"; const char kAshDefaultWallpaperSmall[] = "ash-default-wallpaper-small"; +// Disable the alternate shelf layout. +const char kAshDisableAlternateShelfLayout[] = + "ash-disable-alternate-shelf-layout"; + #if defined(OS_CHROMEOS) // Disable the status tray volume menu for allowing the user to choose an audio // input and output device. @@ -180,8 +184,8 @@ const char kAshDisableDragAndDropAppListToLauncher[] = const char kForcedMaximizeMode[] = "forced-maximize-mode"; bool UseAlternateShelfLayout() { - return CommandLine::ForCurrentProcess()-> - HasSwitch(ash::switches::kAshUseAlternateShelfLayout); + return !CommandLine::ForCurrentProcess()-> + HasSwitch(ash::switches::kAshDisableAlternateShelfLayout); } bool UseDragOffShelf() { @@ -190,8 +194,8 @@ bool UseDragOffShelf() { } bool ShowShelfAlignmentMenu() { - return CommandLine::ForCurrentProcess()-> - HasSwitch(switches::kShowShelfAlignmentMenu); + return !CommandLine::ForCurrentProcess()-> + HasSwitch(switches::kHideShelfAlignmentMenu); } #if defined(OS_CHROMEOS) |