Merge from Chromium at DEPS revision 273901
This commit was generated by merge_to_master.py.
Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index acc29b1..75af414 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -38,13 +38,11 @@
const char kAshDefaultWallpaperLarge[] = "ash-default-wallpaper-large";
const char kAshDefaultWallpaperSmall[] = "ash-default-wallpaper-small";
-// Disable ability to dock windows at the desktop edge.
-const char kAshDisableDockedWindows[] = "ash-disable-docked-windows";
-
-// Enable the Touch Exploration Mode. Touch Exploration Mode will be turned on
-// automatically when spoken feedback is enabled when this flag is set.
-const char kAshEnableTouchExplorationMode[] =
- "ash-enable-touch-exploration-mode";
+// Disable the Touch Exploration Mode. Touch Exploration Mode will no longer be
+// turned on automatically when spoken feedback is enabled when this flag is
+// set.
+const char kAshDisableTouchExplorationMode[] =
+ "ash-disable-touch-exploration-mode";
#if defined(OS_CHROMEOS)
// Enables key bindings to scroll magnified screen.
@@ -110,9 +108,5 @@
#endif
-bool UseDockedWindows() {
- return !CommandLine::ForCurrentProcess()->HasSwitch(kAshDisableDockedWindows);
-}
-
} // namespace switches
} // namespace ash