Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py.
Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index 1241344..a96fafd 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -29,10 +29,6 @@
// Enable keyboard shortcuts useful for debugging.
const char kAshDebugShortcuts[] = "ash-debug-shortcuts";
-// UI to show preferred networks in the status area (for testing).
-const char kAshDebugShowPreferredNetworks[] =
- "ash-debug-show-preferred-networks";
-
// Indicates that the wallpaper images specified by
// kAshDefaultWallpaper{Large,Small} are OEM-specific (i.e. they are not
// downloadable from Google).
@@ -51,48 +47,9 @@
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";
-
-// 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.
@@ -104,37 +61,17 @@
// main monitor as internal.
const char kAshEnableBrightnessControl[] = "ash-enable-brightness-control";
-// Enables putting all windows into immersive fullscreen via <F4>.
-const char kAshEnableImmersiveFullscreenForAllWindows[] =
- "ash-enable-immersive-all-windows";
-
-// Enables putting only browser windows into immersive fullscreen via <F4>.
-// <F4> puts all other windows into non-immersive fullscreen.
-const char kAshEnableImmersiveFullscreenForBrowserOnly[] =
- "ash-enable-immersive-browser-only";
-
-#if defined(OS_LINUX)
-// Enable memory monitoring.
-const char kAshEnableMemoryMonitor[] = "ash-enable-memory-monitor";
-#endif
-
#if defined(OS_CHROMEOS)
// Enables key bindings to scroll magnified screen.
const char kAshEnableMagnifierKeyScroller[] =
"ash-enable-magnifier-key-scroller";
-
-// 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";
-
// 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 touch view testing.
+const char kAshEnableTouchViewTesting[] = "ash-enable-touch-view-testing";
// When this flag is set, system sounds will be played whether the
// ChromeVox is enabled or not.
@@ -143,9 +80,6 @@
// 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.
-const char kAshForceMirrorMode[] = "ash-force-mirror-mode";
-
// Wallpaper to use in guest mode (as paths to trusted, non-user-writable JPEG
// files).
const char kAshGuestWallpaperLarge[] = "ash-guest-wallpaper-large";
@@ -162,21 +96,12 @@
// "1024x768*2" sets the scale factor to 2 for a high DPI display.
const char kAshHostWindowBounds[] = "ash-host-window-bounds";
-// Specifies the delay in milliseconds before beginning overview mode after
-// getting an alt tab keypress.
-const char kAshOverviewDelayOnAltTab[] = "ash-overview-delay-on-alt-tab";
-
// Specifies the layout mode and offsets for the secondary display for
// testing. The format is "<t|r|b|l>,<offset>" where t=TOP, r=RIGHT,
// b=BOTTOM and L=LEFT. For example, 'r,-100' means the secondary display
// is positioned on the right with -100 offset. (above than primary)
const char kAshSecondaryDisplayLayout[] = "ash-secondary-display-layout";
-// Use the old behavior where the user can pick the width of a side maximized
-// window. The user selects the width of the side maximized window based on how
-// far off the edge of the work area they drag the window.
-const char kAshMultipleSnapWindowWidths[] = "ash-multiple-snap-window-widths";
-
// Enables the heads-up display for tracking touch points.
const char kAshTouchHud[] = "ash-touch-hud";
@@ -206,16 +131,9 @@
#endif
-// 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);
+ return !CommandLine::ForCurrentProcess()->
+ HasSwitch(kAshDisableAlternateFrameCaptionButtonStyle);
}
bool UseAlternateShelfLayout() {
@@ -223,50 +141,9 @@
HasSwitch(kAshDisableAlternateShelfLayout);
}
-bool UseDragOffShelf() {
- return !CommandLine::ForCurrentProcess()->
- HasSwitch(kAshDisableDragOffShelf);
-}
-
-bool UseImmersiveFullscreenForAllWindows() {
- return !CommandLine::ForCurrentProcess()->HasSwitch(
- kAshEnableImmersiveFullscreenForBrowserOnly);
-}
-
-bool ShowShelfAlignmentMenu() {
- return !CommandLine::ForCurrentProcess()->
- HasSwitch(kHideShelfAlignmentMenu);
-}
-
-bool UseMultiUserTray() {
-#if defined(OS_CHROMEOS)
- // TODO(skuhne): If this gets removed for good, remove also
- // |SystemTray::user_items_| and the use of it.
- return CommandLine::ForCurrentProcess()->HasSwitch(kAshEnableMultiUserTray);
-#else
- return false;
-#endif
-}
-
-bool UseOverviewMode() {
- return !CommandLine::ForCurrentProcess()->HasSwitch(kAshDisableOverviewMode);
-}
-
bool UseDockedWindows() {
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