diff options
| author | dzhioev <dzhioev@chromium.org> | 2014-09-19 10:09:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-19 17:09:47 +0000 |
| commit | 958e55816c7f9960588b3da7021cd37ec910846b (patch) | |
| tree | 5802e12df712f1abd5628c3b5299f600b498ebaf /chromeos/chromeos_switches.h | |
| parent | 1fce1ab55d2128dcb3bcf9945b4c8b388a354484 (diff) | |
| download | chromium_src-958e55816c7f9960588b3da7021cd37ec910846b.zip chromium_src-958e55816c7f9960588b3da7021cd37ec910846b.tar.gz chromium_src-958e55816c7f9960588b3da7021cd37ec910846b.tar.bz2 | |
Host pairing OOBE starts at the right time.
The following behaviour implmented:
* If "new-remora-oobe" switch is not set, OOBE starts with with the regular
"remora" UI. At the same time wizard controller we start to listen for
incoming connection from shark controller. If connection is established, we
switch UI to the new one.
* Otherwise, we launch the new UI from the beginning of OOBE.
Several small issues fixed as well.
BUG=405150
TEST=manually
Review URL: https://codereview.chromium.org/528803002
Cr-Commit-Position: refs/heads/master@{#295721}
Diffstat (limited to 'chromeos/chromeos_switches.h')
| -rw-r--r-- | chromeos/chromeos_switches.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h index 4b270e5..e67a10c 100644 --- a/chromeos/chromeos_switches.h +++ b/chromeos/chromeos_switches.h @@ -62,6 +62,7 @@ CHROMEOS_EXPORT extern const char kGuestSession[]; CHROMEOS_EXPORT extern const char kHasChromeOSDiamondKey[]; CHROMEOS_EXPORT extern const char kHasChromeOSKeyboard[]; CHROMEOS_EXPORT extern const char kHomedir[]; +CHROMEOS_EXPORT extern const char kHostPairingOobe[]; CHROMEOS_EXPORT extern const char kIgnoreUserProfileMappingForTests[]; CHROMEOS_EXPORT extern const char kKioskModeScreensaverPath[]; CHROMEOS_EXPORT extern const char kLoginManager[]; @@ -73,7 +74,6 @@ CHROMEOS_EXPORT extern const char kOobeSkipPostLogin[]; CHROMEOS_EXPORT extern const char kOobeTimerInterval[]; CHROMEOS_EXPORT extern const char kPowerStub[]; CHROMEOS_EXPORT extern const char kShillStub[]; -CHROMEOS_EXPORT extern const char kShowHostPairingDemo[]; CHROMEOS_EXPORT extern const char kSmsTestMessages[]; CHROMEOS_EXPORT extern const char kStubCrosSettings[]; CHROMEOS_EXPORT extern const char kTestAutoUpdateUI[]; |