diff options
| author | stevenjb <stevenjb@chromium.org> | 2016-02-29 15:53:33 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-29 23:55:52 +0000 |
| commit | 209a177549a7cce290e8cef22b47f640334a8f52 (patch) | |
| tree | 7ba66df638ff5732130d9c7cc6dfe784f5efd555 /chromeos | |
| parent | beab086f2531fb71d06b49ee23da38fa80fb0584 (diff) | |
| download | chromium_src-209a177549a7cce290e8cef22b47f640334a8f52.zip chromium_src-209a177549a7cce290e8cef22b47f640334a8f52.tar.gz chromium_src-209a177549a7cce290e8cef22b47f640334a8f52.tar.bz2 | |
Support multiple placements in display options UI
This CL:
* Adds parentId, layoutType, and offset to options.DisplayInfo
* Sends !Array<!options.DisplayLayout> to chrome.send('setDisplayLayout') instead of a single layout/offset pair.
* Eliminates the fake entries in DisplayLayoutManagerMulti
* Removes --enable-multi-display-layout and adds --disable-multi-display-layout that just disables the UI entirely for >2 displays.
* The previous DisplayLayoutManager code is still used for 2 displays, DisplayLayoutManagerMulti is used for 3+ displays.
BUG=576375
Review URL: https://codereview.chromium.org/1744583003
Cr-Commit-Position: refs/heads/master@{#378316}
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/chromeos_switches.cc | 6 | ||||
| -rw-r--r-- | chromeos/chromeos_switches.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc index afb9b83f..3776272 100644 --- a/chromeos/chromeos_switches.cc +++ b/chromeos/chromeos_switches.cc @@ -129,6 +129,9 @@ const char kDisableNewKoreanIme[] = "disable-new-korean-ime"; // Disables mtp write support. const char kDisableMtpWriteSupport[] = "disable-mtp-write-support"; +// Enable the multiple display layout UI. +const char kDisableMultiDisplayLayout[] = "disable-multi-display-layout"; + // If this switch is set, the options for suggestions as typing on physical // keyboard will be enabled. const char kEnablePhysicalKeyboardAutocorrect[] = @@ -158,9 +161,6 @@ const char kEnableScreenshotTestingWithMode[] = // than the kiosk app mode. const char kEnableKioskMode[] = "enable-kiosk-mode"; -// Enable the multiple display layout UI. -const char kEnableMultiDisplayLayout[] = "enable-multi-display-layout"; - // Enables request of tablet site (via user agent override). const char kEnableRequestTabletSite[] = "enable-request-tablet-site"; diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h index ee53d4e..92c24fcf 100644 --- a/chromeos/chromeos_switches.h +++ b/chromeos/chromeos_switches.h @@ -46,6 +46,7 @@ CHROMEOS_EXPORT extern const char kDisableHIDDetectionOnOOBE[]; CHROMEOS_EXPORT extern const char kDisableLoginAnimations[]; CHROMEOS_EXPORT extern const char kDisableMemoryPressureSystemChromeOS[]; CHROMEOS_EXPORT extern const char kDisableMtpWriteSupport[]; +CHROMEOS_EXPORT extern const char kDisableMultiDisplayLayout[]; CHROMEOS_EXPORT extern const char kDisableNetworkPortalNotification[]; CHROMEOS_EXPORT extern const char kDisableNewChannelSwitcherUI[]; CHROMEOS_EXPORT extern const char kDisableNewKioskUI[]; @@ -63,7 +64,6 @@ CHROMEOS_EXPORT extern const char kEnableExtensionAssetsSharing[]; CHROMEOS_EXPORT extern const char kEnableFirstRunUITransitions[]; CHROMEOS_EXPORT extern const char kEnableImeMenu[]; CHROMEOS_EXPORT extern const char kEnableKioskMode[]; -CHROMEOS_EXPORT extern const char kEnableMultiDisplayLayout[]; CHROMEOS_EXPORT extern const char kEnableNetworkPortalNotification[]; CHROMEOS_EXPORT extern const char kDisableNewKoreanIme[]; CHROMEOS_EXPORT extern const char kEnablePhysicalKeyboardAutocorrect[]; |