diff options
| author | dzhioev@chromium.org <dzhioev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-04 15:42:31 +0000 |
|---|---|---|
| committer | dzhioev@chromium.org <dzhioev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-04 15:42:31 +0000 |
| commit | a384db51d860f9f2c46b7c532b0381147b49bd82 (patch) | |
| tree | 213a733730510af15422336e9afbacc60c7c3b8e /chromeos/chromeos_switches.h | |
| parent | 8c30325501a76ec2fdd66bbfde16699d3f6332e2 (diff) | |
| download | chromium_src-a384db51d860f9f2c46b7c532b0381147b49bd82.zip chromium_src-a384db51d860f9f2c46b7c532b0381147b49bd82.tar.gz chromium_src-a384db51d860f9f2c46b7c532b0381147b49bd82.tar.bz2 | |
Draft implementation of controller pairing UI.
Implemented paring UI for controller side. This implementation lacks styling,
transitions, images and real strings. However it is fully functional, and can
be used with FakeControllerPairingController or with real controller when it will be
implented.
For testing purposes "show-controller-pairing-demo" switch was added. If this
switch is set, paring procedure will be emulated during OOBE. Demo
flow will be configured with value of "show-controller-pairing-demo" option,
or default config will be used if no value for the option is given.
For config format see comments in fake_controller_pairing_controller.h.
BUG=375191
TEST=none
Review URL: https://codereview.chromium.org/342263002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281409 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/chromeos_switches.h')
| -rw-r--r-- | chromeos/chromeos_switches.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h index 595cc98..33c7679 100644 --- a/chromeos/chromeos_switches.h +++ b/chromeos/chromeos_switches.h @@ -37,6 +37,7 @@ CHROMEOS_EXPORT extern const char kDisableNewChannelSwitcherUI[]; CHROMEOS_EXPORT extern const char kDisableNewKioskUI[]; CHROMEOS_EXPORT extern const char kDisableQuickofficeComponentApp[]; CHROMEOS_EXPORT extern const char kDisableRollbackOption[]; +CHROMEOS_EXPORT extern const char kDisableSamlSignin[]; CHROMEOS_EXPORT extern const char kDisableVolumeAdjustSound[]; CHROMEOS_EXPORT extern const char kEnableCarrierSwitching[]; CHROMEOS_EXPORT extern const char kEnableChromeVoxNext[]; @@ -44,6 +45,7 @@ CHROMEOS_EXPORT extern const char kEnableConsumerManagement[]; CHROMEOS_EXPORT extern const char kEnableEmbeddedSignin[]; CHROMEOS_EXPORT extern const char kEnableExtensionAssetsSharing[]; CHROMEOS_EXPORT extern const char kEnableFileManagerMTP[]; +CHROMEOS_EXPORT extern const char kEnableFirstRunUITransitions[]; CHROMEOS_EXPORT extern const char kEnableKioskMode[]; CHROMEOS_EXPORT extern const char kEnableNetworkPortalNotification[]; CHROMEOS_EXPORT extern const char kEnableOkGoogleVoiceSearch[]; @@ -55,6 +57,7 @@ CHROMEOS_EXPORT extern const char kEnterpriseEnrollmentModulusLimit[]; CHROMEOS_EXPORT extern const char kEnterpriseEnrollmentSkipRobotAuth[]; CHROMEOS_EXPORT extern const char kFileManagerEnableNewGallery[]; CHROMEOS_EXPORT extern const char kFirstExecAfterBoot[]; +CHROMEOS_EXPORT extern const char kForceFirstRunUI[]; CHROMEOS_EXPORT extern const char kForceLoginManagerInTests[]; CHROMEOS_EXPORT extern const char kGuestSession[]; CHROMEOS_EXPORT extern const char kHasChromeOSDiamondKey[]; @@ -66,16 +69,14 @@ CHROMEOS_EXPORT extern const char kLoginManager[]; CHROMEOS_EXPORT extern const char kLoginProfile[]; CHROMEOS_EXPORT extern const char kLoginUser[]; CHROMEOS_EXPORT extern const char kNaturalScrollDefault[]; +CHROMEOS_EXPORT extern const char kOobeGuestSession[]; CHROMEOS_EXPORT extern const char kOobeSkipPostLogin[]; CHROMEOS_EXPORT extern const char kOobeTimerInterval[]; -CHROMEOS_EXPORT extern const char kOobeGuestSession[]; CHROMEOS_EXPORT extern const char kPowerStub[]; CHROMEOS_EXPORT extern const char kShillStub[]; +CHROMEOS_EXPORT extern const char kShowControllerPairingDemo[]; CHROMEOS_EXPORT extern const char kSmsTestMessages[]; CHROMEOS_EXPORT extern const char kStubCrosSettings[]; -CHROMEOS_EXPORT extern const char kForceFirstRunUI[]; -CHROMEOS_EXPORT extern const char kEnableFirstRunUITransitions[]; -CHROMEOS_EXPORT extern const char kDisableSamlSignin[]; CHROMEOS_EXPORT extern const char kTestAutoUpdateUI[]; } // namespace switches |