Merge from Chromium at DEPS revision r199464
This commit was generated by merge_to_master.py.
Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index 516fa60..72cfd9d 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -48,9 +48,6 @@
const char kAshDisableDisplayChangeLimiter[] =
"ash-disable-display-change-limiter";
-// Disables creating a launcher per display.
-const char kAshDisableLauncherPerDisplay[] = "ash-disable-launcher-per-display";
-
// Disable the new cras audio handler.
const char kAshDisableNewAudioHandler[] = "ash-disable-new-audio-handler";
@@ -141,11 +138,15 @@
// 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
+// Allow items to be dragged from the app launcher list into the launcher.
+const char kAshDragAndDropAppListToLauncher[] =
+ "ash-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";
-
} // namespace switches
} // namespace ash