Merge from Chromium at DEPS revision 228962
This commit was generated by merge_to_master.py.
Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index c64b090..70b1340 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -33,13 +33,6 @@
const char kAshDebugShowPreferredNetworks[] =
"ash-debug-show-preferred-networks";
-// Default wallpaper to use in guest mode (as paths to trusted,
-// non-user-writable JPEG files).
-const char kAshDefaultGuestWallpaperLarge[] =
- "ash-default-guest-wallpaper-large";
-const char kAshDefaultGuestWallpaperSmall[] =
- "ash-default-guest-wallpaper-small";
-
// Default wallpaper to use (as paths to trusted, non-user-writable JPEG files).
const char kAshDefaultWallpaperLarge[] = "ash-default-wallpaper-large";
const char kAshDefaultWallpaperSmall[] = "ash-default-wallpaper-small";
@@ -68,9 +61,6 @@
const char kAshDisableDisplayChangeLimiter[] =
"ash-disable-display-change-limiter";
-// If present new lock animations are enabled.
-const char kAshDisableNewLockAnimations[] = "ash-disable-new-lock-animations";
-
// Disable immersive fullscreen mode, regardless of default setting.
const char kAshDisableImmersiveFullscreen[] =
"ash-disable-immersive-fullscreen";
@@ -111,6 +101,12 @@
// Disable dragging items off the shelf to unpin them.
const char kAshDisableDragOffShelf[] = "ash-disable-drag-off-shelf";
+#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
+
// Enable immersive fullscreen mode, regardless of default setting.
const char kAshEnableImmersiveFullscreen[] = "ash-enable-immersive-fullscreen";
@@ -118,15 +114,11 @@
// Enable memory monitoring.
const char kAshEnableMemoryMonitor[] = "ash-enable-memory-monitor";
#endif
-#if defined(OS_CHROMEOS)
-// Enable the shelf menu for multi profile usage.
-const char kAshEnableMultiProfileShelfMenu[] = "ash-enable-multi-profile-shelf";
-#endif
// Enables the Oak tree viewer.
const char kAshEnableOak[] = "ash-enable-oak";
-// Enables overview mode for window switching.
-const char kAshEnableOverviewMode[] = "ash-enable-overview-mode";
+// Disables overview mode for window switching.
+const char kAshDisableOverviewMode[] = "ash-disable-overview-mode";
// Enables software based mirroring.
const char kAshEnableSoftwareMirroring[] = "ash-enable-software-mirroring";
@@ -140,6 +132,11 @@
// 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";
+const char kAshGuestWallpaperSmall[] = "ash-guest-wallpaper-small";
+
// Hides notifications that are irrelevant to Chrome OS device factory testing,
// such as battery level updates.
const char kAshHideNotificationsForFactory[] =
@@ -156,6 +153,10 @@
const char kAshImmersiveHideTabIndicators[] =
"ash-immersive-hide-tab-indicators";
+// OEM-supplied wallpaper (as paths to trusted, non-user-writable JPEG files).
+const char kAshOemWallpaperLarge[] = "ash-oem-wallpaper-large";
+const char kAshOemWallpaperSmall[] = "ash-oem-wallpaper-small";
+
// 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
@@ -199,10 +200,6 @@
const char kAshDisableDragAndDropAppListToLauncher[] =
"ash-disable-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";
-
bool UseAlternateFrameCaptionButtonStyle() {
return CommandLine::ForCurrentProcess()->
HasSwitch(kAshEnableAlternateFrameCaptionButtonStyle);
@@ -223,16 +220,20 @@
HasSwitch(kHideShelfAlignmentMenu);
}
-// Returns true if the MultiProfile shelf menu should be shown.
-bool ShowMultiProfileShelfMenu() {
+// Returns true if the full multi profile mode (M-31 version) is active.
+bool UseFullMultiProfileMode() {
#if defined(OS_CHROMEOS)
return CommandLine::ForCurrentProcess()->
- HasSwitch(kAshEnableMultiProfileShelfMenu);
+ HasSwitch(kAshEnableFullMultiProfileMode);
#else
return false;
#endif
}
+bool UseOverviewMode() {
+ return !CommandLine::ForCurrentProcess()->HasSwitch(kAshDisableOverviewMode);
+}
+
#if defined(OS_CHROMEOS)
bool ShowAudioDeviceMenu() {
return !CommandLine::ForCurrentProcess()->