Merge from Chromium at DEPS revision r210036
This commit was generated by merge_to_master.py.
Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index cc64455..2e67ee5 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -29,6 +29,17 @@
// Enable keyboard shortcuts useful for debugging.
const char kAshDebugShortcuts[] = "ash-debug-shortcuts";
+// 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";
+
// Disable auto window maximization logic.
const char kAshDisableAutoMaximizing[] = "ash-disable-auto-maximizing";
@@ -63,6 +74,10 @@
#if defined(OS_CHROMEOS)
// Disable compositor based mirroring.
const char kAshDisableSoftwareMirroring[] = "ash-disable-software-mirroring";
+
+// Disable the notification when a low-power USB charger is connected.
+const char kAshDisableUsbChargerNotification[] =
+ "ash-disable-usb-charger-notification";
#endif
// Extend the status tray volume item to allow the user to choose an audio
@@ -178,5 +193,12 @@
HasSwitch(ash::switches::kAshUseAlternateShelfLayout);
}
+#if defined(OS_CHROMEOS)
+bool UseUsbChargerNotification() {
+ return !CommandLine::ForCurrentProcess()->
+ HasSwitch(ash::switches::kAshDisableUsbChargerNotification);
+}
+#endif
+
} // namespace switches
} // namespace ash