Enabling the new drag off shellf feature 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 72 matching lines @@
 // Enable advanced gestures (e.g. for window management).
 const char kAshEnableAdvancedGestures[] = "ash-enable-advanced-gestures";
 
 // Always enable brightness control. Used by machines that don't report their
 // main monitor as internal.
 const char kAshEnableBrightnessControl[] = "ash-enable-brightness-control";
 
 // Enable the dock area on a desktop.
 const char kAshEnableDockedWindows[] = "ash-enable-docked-windows";
 
-// Enable dragging items off the shelf to unpin them.
-const char kAshEnableDragOffShelf[] = "ash-enable-drag-off-shelf";
+// Disable dragging items off the shelf to unpin them.
+const char kAshDisableDragOffShelf[] = "ash-disable-drag-off-shelf";
 
 // Enable immersive fullscreen mode, regardless of default setting.
 const char kAshEnableImmersiveFullscreen[] = "ash-enable-immersive-fullscreen";
 
 #if defined(OS_LINUX)
 // Enable memory monitoring.
 const char kAshEnableMemoryMonitor[] = "ash-enable-memory-monitor";
 #endif
 
 // Enables the Oak tree viewer.
@@ skipping 73 matching lines @@
 // 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);
 }
 
 bool UseDragOffShelf() {
-  return CommandLine::ForCurrentProcess()->
-      HasSwitch(ash::switches::kAshEnableDragOffShelf);
+  return !CommandLine::ForCurrentProcess()->
+      HasSwitch(ash::switches::kAshDisableDragOffShelf);
 }
 
 bool ShowShelfAlignmentMenu() {
   return CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kShowShelfAlignmentMenu);
 }
 
 #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