summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
authordavidyu@chromium.org <davidyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-17 12:25:13 +0000
committerdavidyu@chromium.org <davidyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-17 12:25:13 +0000
commit3170e9ab03724efc5602a95389927acaa3fb722f (patch)
tree71594ed6f2aa2e8b9e05004cfa9352e0c21b21cf /chromeos
parent29a0d6ddb6cd2748fef573393b160d36fc8c4451 (diff)
downloadchromium_src-3170e9ab03724efc5602a95389927acaa3fb722f.zip
chromium_src-3170e9ab03724efc5602a95389927acaa3fb722f.tar.gz
chromium_src-3170e9ab03724efc5602a95389927acaa3fb722f.tar.bz2
Add a command line switch --enable-consumer-management.
Add a security section and a consumer management enroll button in the settings page and make it hidden behind the command line switch. Rename the original security section in the settings page to "certificates", as that is what it is. BUG=353050 TEST=manual Review URL: https://codereview.chromium.org/234583003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264480 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/chromeos_switches.cc4
-rw-r--r--chromeos/chromeos_switches.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
index dca8f8a..c5c9837 100644
--- a/chromeos/chromeos_switches.cc
+++ b/chromeos/chromeos_switches.cc
@@ -65,6 +65,10 @@ const char kEchoExtensionPath[] = "echo-ext-path";
// Enables switching between different cellular carriers from the UI.
const char kEnableCarrierSwitching[] = "enable-carrier-switching";
+// Enables consumer management, which allows user to enroll, remotely lock and
+// locate the device.
+const char kEnableConsumerManagement[] = "enable-consumer-management";
+
// Enables MTP support in Files.app.
const char kEnableFileManagerMTP[] = "enable-filemanager-mtp";
diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h
index e56ce7a..62ab183 100644
--- a/chromeos/chromeos_switches.h
+++ b/chromeos/chromeos_switches.h
@@ -37,6 +37,7 @@ CHROMEOS_EXPORT extern const char kDisableQuickofficeComponentApp[];
CHROMEOS_EXPORT extern const char kDisableVolumeAdjustSound[];
CHROMEOS_EXPORT extern const char kEchoExtensionPath[];
CHROMEOS_EXPORT extern const char kEnableCarrierSwitching[];
+CHROMEOS_EXPORT extern const char kEnableConsumerManagement[];
CHROMEOS_EXPORT extern const char kEnableFileManagerMTP[];
CHROMEOS_EXPORT extern const char kEnableKioskMode[];
CHROMEOS_EXPORT extern const char kEnableNetworkPortalNotification[];