summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 04:32:15 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 04:32:15 +0000
commit0301c5f1f84b28976a3af850169a282c217731fe (patch)
treeac13097c110b11ca4fa0d453912b187ca0b43a70 /chromeos
parentcc611680a91c1a149f2c4830bceec7dc00a2bc70 (diff)
downloadchromium_src-0301c5f1f84b28976a3af850169a282c217731fe.zip
chromium_src-0301c5f1f84b28976a3af850169a282c217731fe.tar.gz
chromium_src-0301c5f1f84b28976a3af850169a282c217731fe.tar.bz2
Reland r246152 cros: Change how multi-profile is enabled.
- Remove finch control so that enterprise enrollment is no longer required; - Change the default behavior for primary user to be "not-allowed" so that only user with a proper enterprise policy could start a multi-profile session; - Remove cached default behavior so that the changing default actually has effect; BUG=336268 TEST=Manual. Only user with proper policy can start a multiprofile session. Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=246152 Review URL: https://codereview.chromium.org/142403002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/chromeos_switches.cc5
-rw-r--r--chromeos/chromeos_switches.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
index ccfb26c..cbb7792 100644
--- a/chromeos/chromeos_switches.cc
+++ b/chromeos/chromeos_switches.cc
@@ -143,6 +143,11 @@ const char kFirstExecAfterBoot[] = "first-exec-after-boot";
// tests can change how it's brought up. This flag disables that.
const char kForceLoginManagerInTests[] = "force-login-manager-in-tests";
+// Sets primary user's default multiprofile behavior to 'unrestricted' for
+// tests so that multiprofile is enabled for any user.
+// TODO(xiyuan): Remove when multiprofile is released to everyone.
+const char kForceMultiProfileInTests[] = "force-multi-profiles-in-tests";
+
// Makes GPU sandbox failures nonfatal.
const char kGpuSandboxFailuresNonfatal[] = "gpu-sandbox-failures-nonfatal";
diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h
index 319f826..7f131ae 100644
--- a/chromeos/chromeos_switches.h
+++ b/chromeos/chromeos_switches.h
@@ -56,6 +56,7 @@ CHROMEOS_EXPORT extern const char kFileManagerEnableWebstoreIntegration[];
CHROMEOS_EXPORT extern const char kFileManagerEnableMultiProfile[];
CHROMEOS_EXPORT extern const char kFirstExecAfterBoot[];
CHROMEOS_EXPORT extern const char kForceLoginManagerInTests[];
+CHROMEOS_EXPORT extern const char kForceMultiProfileInTests[];
CHROMEOS_EXPORT extern const char kGpuSandboxFailuresNonfatal[];
CHROMEOS_EXPORT extern const char kGuestSession[];
CHROMEOS_EXPORT extern const char kHasChromeOSDiamondKey[];