ash:Shelf - Enable Alternate Shelf and Side Shelf by default.

ash/ash_switches.cc

 // 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.
 
 #include "ash/ash_switches.h"
 
 #include "base/command_line.h"
 
 namespace ash {
 namespace switches {
@@ skipping 26 matching lines @@
 // non-user-writable JPEG files).
 const char kAshDefaultGuestWallpaperLarge[] =
     "ash-default-guest-wallpaper-large";
 const char kAshDefaultGuestWallpaperSmall[] =
     "ash-default-guest-wallpaper-small";
 
 // Default wallpaper to use (as paths to trusted, non-user-writable JPEG files).
 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.
 const char kAshDisableAudioDeviceMenu[] =
     "ash-disable-audio-device-menu";
 #endif
 
 // Disable auto window maximization logic.
 const char kAshDisableAutoMaximizing[] = "ash-disable-auto-maximizing";
 
@@ skipping 116 matching lines @@
 
 // Disallow items to be dragged from the app launcher list into the launcher.
 const char kAshDisableDragAndDropAppListToLauncher[] =
     "ash-disable-drag-and-drop-applist-to-launcher";
 
 // Enables a mode which enforces all browser & application windows to be created
 // in maximized mode.
 const char kForcedMaximizeMode[] = "forced-maximize-mode";
 
 bool UseAlternateShelfLayout() {
-  return CommandLine::ForCurrentProcess()->
-      HasSwitch(ash::switches::kAshUseAlternateShelfLayout);
+  return !CommandLine::ForCurrentProcess()->
+      HasSwitch(ash::switches::kAshDisableAlternateShelfLayout);
 }
 
 bool UseDragOffShelf() {
   return CommandLine::ForCurrentProcess()->
       HasSwitch(ash::switches::kAshEnableDragOffShelf);
 }
 
 bool ShowShelfAlignmentMenu() {
-  return CommandLine::ForCurrentProcess()->
-      HasSwitch(switches::kShowShelfAlignmentMenu);
+  return !CommandLine::ForCurrentProcess()->
+      HasSwitch(switches::kHideShelfAlignmentMenu);
 }
 
 #if defined(OS_CHROMEOS)
 bool ShowAudioDeviceMenu() {
   return !CommandLine::ForCurrentProcess()->
       HasSwitch(ash::switches::kAshDisableAudioDeviceMenu);
 }
 
 bool UseUsbChargerNotification() {
   return !CommandLine::ForCurrentProcess()->
       HasSwitch(ash::switches::kAshDisableUsbChargerNotification);
 }
 #endif
 
 }  // namespace switches
 }  // namespace ash