summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
authormerkulova@chromium.org <merkulova@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-17 19:20:22 +0000
committermerkulova@chromium.org <merkulova@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-17 19:20:22 +0000
commit8e2da10680181399b706e1b40256dbc7698d3b63 (patch)
tree42cf5ea6f4532b04f72eb6273ac367b71e607413 /chromeos
parentbf01f9004e3ab7401f2ade3a4aafab55aeb4dbc5 (diff)
downloadchromium_src-8e2da10680181399b706e1b40256dbc7698d3b63.zip
chromium_src-8e2da10680181399b706e1b40256dbc7698d3b63.tar.gz
chromium_src-8e2da10680181399b706e1b40256dbc7698d3b63.tar.bz2
Flag covering HID-detection OOBE screen removed.
BUG=127016 TBR=rkc@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=276656 Review URL: https://codereview.chromium.org/273533004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277835 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/chromeos_switches.cc6
-rw-r--r--chromeos/chromeos_switches.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
index 66c0f79..e0f4614 100644
--- a/chromeos/chromeos_switches.cc
+++ b/chromeos/chromeos_switches.cc
@@ -36,6 +36,9 @@ const char kDisableDemoMode[] = "disable-demo-mode";
// Disable Genius App and use the original Help App instead.
const char kDisableGeniusApp[] = "disable-genius-app";
+// Disable HID-detection OOBE screen.
+const char kDisableHIDDetectionOnOOBE[] = "disable-hid-detection-on-oobe";
+
// Avoid doing expensive animations upon login.
const char kDisableLoginAnimations[] = "disable-login-animations";
@@ -85,9 +88,6 @@ const char kEnableExtensionAssetsSharing[] = "enable-extension-assets-sharing";
// Enables MTP support in Files.app.
const char kEnableFileManagerMTP[] = "enable-filemanager-mtp";
-// Enable explicit HID detection on OOBE.
-const char kEnableHIDDetectionOnOOBE[] = "enable-hid-detection-on-oobe";
-
// Enables notifications about captive portals in session.
const char kEnableNetworkPortalNotification[] =
"enable-network-portal-notification";
diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h
index 20d3625..e5fa280 100644
--- a/chromeos/chromeos_switches.h
+++ b/chromeos/chromeos_switches.h
@@ -29,6 +29,7 @@ CHROMEOS_EXPORT extern const char kDerelictIdleTimeout[];
CHROMEOS_EXPORT extern const char kDisableBootAnimation[];
CHROMEOS_EXPORT extern const char kDisableDemoMode[];
CHROMEOS_EXPORT extern const char kDisableGeniusApp[];
+CHROMEOS_EXPORT extern const char kDisableHIDDetectionOnOOBE[];
CHROMEOS_EXPORT extern const char kDisableLoginAnimations[];
CHROMEOS_EXPORT extern const char kDisableLoginScrollIntoView[];
CHROMEOS_EXPORT extern const char kDisableNetworkPortalNotification[];
@@ -43,7 +44,6 @@ 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 kEnableHIDDetectionOnOOBE[];
CHROMEOS_EXPORT extern const char kEnableKioskMode[];
CHROMEOS_EXPORT extern const char kEnableNetworkPortalNotification[];
CHROMEOS_EXPORT extern const char kEnableRequestTabletSite[];