Re-enables docked windows by default in M34

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 48 matching lines @@
 #endif
 
 // Disable auto window maximization logic.
 const char kAshDisableAutoMaximizing[] = "ash-disable-auto-maximizing";
 
 // Disables the limitter to throttle how quickly a user
 // can change display settings.
 const char kAshDisableDisplayChangeLimiter[] =
     "ash-disable-display-change-limiter";
 
+// Disable ability to dock windows at the desktop edge.
+const char kAshDisableDockedWindows[] = "ash-disable-docked-windows";
+
+// Disallow items to be dragged from the app launcher list into the launcher.
+const char kAshDisableDragAndDropAppListToLauncher[] =
+    "ash-disable-drag-and-drop-applist-to-launcher";
+
+// Disable dragging items off the shelf to unpin them.
+const char kAshDisableDragOffShelf[] = "ash-disable-drag-off-shelf";
+
+// Disables overview mode for window switching.
+const char kAshDisableOverviewMode[] = "ash-disable-overview-mode";
+
 #if defined(OS_CHROMEOS)
 // Disable the notification when a low-power USB charger is connected.
 const char kAshDisableUsbChargerNotification[] =
     "ash-disable-usb-charger-notification";
 
 // TODO(jamescook): Remove this unused flag. It exists only to allow the
 // "Enable audio device menu" about:flags item to have the tri-state
 // default/enabled/disabled UI.
 const char kAshEnableAudioDeviceMenu[] = "ash-enable-audio-device-menu";
 #endif  // defined(OS_CHROMEOS)
 
 // Enable advanced gestures (e.g. for window management).
 const char kAshEnableAdvancedGestures[] = "ash-enable-advanced-gestures";
 
 // Use alternate visual style for the caption buttons (minimize, maximize,
 // restore, close). The alternate style:
 // - Adds a dedicated button for minimize.
 // - Removes the maximize button's help bubble.
 const char kAshEnableAlternateFrameCaptionButtonStyle[] =
     "ash-enable-alternate-caption-button";
 
 // Always enable brightness control. Used by machines that don't report their
 // main monitor as internal.
 const char kAshEnableBrightnessControl[] = "ash-enable-brightness-control";
 
-// Enable ability to dock windows at the desktop edge.
-const char kAshEnableDockedWindows[] = "ash-enable-docked-windows";
-
-// Disable dragging items off the shelf to unpin them.
-const char kAshDisableDragOffShelf[] = "ash-disable-drag-off-shelf";
-
 // Enables putting all windows into immersive fullscreen via <F4>.
 const char kAshEnableImmersiveFullscreenForAllWindows[] =
     "ash-enable-immersive-all-windows";
 
 #if defined(OS_CHROMEOS)
 // Enables the "full multi profile mode" - as it was in M-31.
 const char kAshEnableFullMultiProfileMode[] =
     "ash-enable-full-multi-profile-mode";
 #endif
 
 #if defined(OS_LINUX)
 // Enable memory monitoring.
 const char kAshEnableMemoryMonitor[] = "ash-enable-memory-monitor";
 #endif
 
 #if defined(OS_CHROMEOS)
 // Enables the multi user icons in the system tray.
 const char kAshEnableMultiUserTray[] = "ash-enable-multi-user-tray";
 #endif
 
 // Enables the Oak tree viewer.
 const char kAshEnableOak[] = "ash-enable-oak";
 
-// Disables overview mode for window switching.
-const char kAshDisableOverviewMode[] = "ash-disable-overview-mode";
-
 // Enables software based mirroring.
 const char kAshEnableSoftwareMirroring[] = "ash-enable-software-mirroring";
 
 // Enables "sticky" edges instead of "snap-to-edge"
 const char kAshEnableStickyEdges[] = "ash-enable-sticky-edges";
 
 // Enables showing the tray bubble by dragging on the shelf.
 const char kAshEnableTrayDragging[] = "ash-enable-tray-dragging";
 
 // Forces chrome to use mirror mode when an external display is connected.
@@ skipping 34 matching lines @@
 const char kAshTouchHud[] = "ash-touch-hud";
 
 // Use alternate layout of the shelf for testing a new look and feel:
 // Slightly smaller profile, only 2 states for the "bar highlight" on
 // launcher buttons, app list icon with more visible state indication,
 // app list icon repositionable and defaulting as 1st item in shelf,
 // more visible state indication for background on status area.
 // crbug's [244983, 244990, 244994, 245005, 245012]
 const char kAshUseAlternateShelfLayout[] = "ash-use-alternate-shelf";
 
-// Flags explicitly show or hide the shelf alignment menu.
-const char kShowShelfAlignmentMenu[] = "show-launcher-alignment-menu";
-const char kHideShelfAlignmentMenu[] = "hide-launcher-alignment-menu";
-
 // Uses the 1st display in --ash-host-window-bounds as internal display.
 // This is for debugging on linux desktop.
 const char kAshUseFirstDisplayAsInternal[] =
     "ash-use-first-display-as-internal";
 
 // (Most) Chrome OS hardware reports ACPI power button releases correctly.
 // Standard hardware reports releases immediately after presses.  If set, we
 // lock the screen or shutdown the system immediately in response to a press
 // instead of displaying an interactive animation.
 const char kAuraLegacyPowerButton[] = "aura-legacy-power-button";
 
 #if defined(OS_WIN)
 // Force Ash to open its root window on the desktop, even on Windows 8 where
 // it would normally end up in metro.
 const char kForceAshToDesktop[] = "ash-force-desktop";
 
 #endif
 
-// Disallow items to be dragged from the app launcher list into the launcher.
-const char kAshDisableDragAndDropAppListToLauncher[] =
-    "ash-disable-drag-and-drop-applist-to-launcher";
+// Flags explicitly show or hide the shelf alignment menu.
+const char kShowShelfAlignmentMenu[] = "show-launcher-alignment-menu";
+const char kHideShelfAlignmentMenu[] = "hide-launcher-alignment-menu";
 
 bool UseAlternateFrameCaptionButtonStyle() {
   // For the sake of simplicity, the alternate caption button style is only
   // used if snapped windows are always 50% of the screen's width.
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   return command_line->HasSwitch(kAshEnableAlternateFrameCaptionButtonStyle) &&
       !command_line->HasSwitch(kAshMultipleSnapWindowWidths);
 }
 
 bool UseAlternateShelfLayout() {
@@ skipping 29 matching lines @@
 #else
   return false;
 #endif
 }
 
 bool UseOverviewMode() {
   return !CommandLine::ForCurrentProcess()->HasSwitch(kAshDisableOverviewMode);
 }
 
 bool UseDockedWindows() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(kAshEnableDockedWindows);
+  return !CommandLine::ForCurrentProcess()->HasSwitch(kAshDisableDockedWindows);
 }
 
 #if defined(OS_CHROMEOS)
 bool ShowAudioDeviceMenu() {
   return !CommandLine::ForCurrentProcess()->
       HasSwitch(kAshDisableAudioDeviceMenu);
 }
 
 bool UseUsbChargerNotification() {
   return !CommandLine::ForCurrentProcess()->
       HasSwitch(kAshDisableUsbChargerNotification);
 }
 #endif
 
 }  // namespace switches
 }  // namespace ash