summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-15 04:57:28 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-15 04:57:28 +0000
commit81ae53ce75948baa014052167ee8adbb87172af1 (patch)
tree9affeb72b7951262f9a31f687c01c1ea49e635b0 /chromeos
parent6a8b1086b7128e6055f7a592fcbad0659422d833 (diff)
downloadchromium_src-81ae53ce75948baa014052167ee8adbb87172af1.zip
chromium_src-81ae53ce75948baa014052167ee8adbb87172af1.tar.gz
chromium_src-81ae53ce75948baa014052167ee8adbb87172af1.tar.bz2
Reland 251352 "cros: Enable multiprofile for everyone."
> cros: Enable multiprofile for everyone. > > BUG=338941 > R=dpolukhin@chromium.org, nkostylev@chromium.org R=dpolukhin@chromium.org, nkostylev@chromium.org Review URL: https://codereview.chromium.org/146193005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251522 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, 0 insertions, 6 deletions
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
index fede17d..619d14b 100644
--- a/chromeos/chromeos_switches.cc
+++ b/chromeos/chromeos_switches.cc
@@ -149,11 +149,6 @@ 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 d2c5cf1..eb23bf3 100644
--- a/chromeos/chromeos_switches.h
+++ b/chromeos/chromeos_switches.h
@@ -58,7 +58,6 @@ CHROMEOS_EXPORT extern const char kFileManagerEnableNewAudioPlayer[];
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[];