Index: ui/display/display_switches.cc |
diff --git a/ui/display/display_switches.cc b/ui/display/display_switches.cc |
index 445b0c635900e693e5e5741da2349dd6f9be160e..945635dfe99a884cf7a0bee8196c505cd130806c 100644 |
--- a/ui/display/display_switches.cc |
+++ b/ui/display/display_switches.cc |
@@ -10,29 +10,33 @@ namespace switches { |
// TODO(rjkroege): Some of these have an "ash" prefix. When ChromeOS startup |
// scripts have been updated, the leading "ash" prefix should be removed. |
+// Enables software based mirroring. |
+const char kEnableSoftwareMirroring[] = "ash-enable-software-mirroring"; |
+ |
// Overrides the device scale factor for the browser UI and the contents. |
const char kForceDeviceScaleFactor[] = "force-device-scale-factor"; |
+// Sets a window size, optional position, and optional scale factor. |
+// "1024x768" creates a window of size 1024x768. |
+// "100+200-1024x768" positions the window at 100,200. |
+// "1024x768*2" sets the scale factor to 2 for a high DPI display. |
+// "800,0+800-800x800" for two displays at 800x800 resolution. |
+// "800,0+800-800x800,0+1600-800x800" for three displays at 800x800 resolution. |
+const char kHostWindowBounds[] = "ash-host-window-bounds"; |
+ |
// 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 kSecondaryDisplayLayout[] = "secondary-display-layout"; |
-// Enables software based mirroring. |
-const char kEnableSoftwareMirroring[] = "ash-enable-software-mirroring"; |
+// Specifies the initial screen configuration, or state of all displays, for |
+// FakeDisplayDelegate, see class for format details. |
+const char kScreenConfig[] = "screen-config"; |
// Uses the 1st display in --ash-host-window-bounds as internal display. |
// This is for debugging on linux desktop. |
-const char kUseFirstDisplayAsInternal[] = "ash-use-first-display-as-internal"; |
- |
-// Sets a window size, optional position, and optional scale factor. |
-// "1024x768" creates a window of size 1024x768. |
-// "100+200-1024x768" positions the window at 100,200. |
-// "1024x768*2" sets the scale factor to 2 for a high DPI display. |
-// "800,0+800-800x800" for two displays at 800x800 resolution. |
-// "800,0+800-800x800,0+1600-800x800" for three displays at 800x800 resolution. |
-const char kHostWindowBounds[] = "ash-host-window-bounds"; |
+const char kUseFirstDisplayAsInternal[] = "use-first-display-as-internal"; |
#if defined(OS_CHROMEOS) |
const char kDisableDisplayColorCalibration[] = |