diff options
| author | atwilson <atwilson@chromium.org> | 2014-08-24 03:20:30 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-24 10:21:27 +0000 |
| commit | 8a792dcd00abdea12272f33b03327925e19e43a5 (patch) | |
| tree | 51d7228d306a16400da23463d9563e45758f72b7 | |
| parent | 70cdd67c0293cef1216422386ff92018770c4b70 (diff) | |
| download | chromium_src-8a792dcd00abdea12272f33b03327925e19e43a5.zip chromium_src-8a792dcd00abdea12272f33b03327925e19e43a5.tar.gz chromium_src-8a792dcd00abdea12272f33b03327925e19e43a5.tar.bz2 | |
Revert "Set default multi-profile policy to not-allowed."
No longer need this change on trunk now that it has been tested and
merged to M37 branch.
This reverts commit fd85a93bdc99509f302c33cb808ffafc49e7acfe.
BUG=405983
TBR=bartfab@chromium.org
Review URL: https://codereview.chromium.org/499923002
Cr-Commit-Position: refs/heads/master@{#291625}
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc index 8c9d69c..1dc5111 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc @@ -280,13 +280,13 @@ void UserCloudPolicyManagerChromeOS::OnComponentCloudPolicyUpdated() { void UserCloudPolicyManagerChromeOS::GetChromePolicy(PolicyMap* policy_map) { CloudPolicyManager::GetChromePolicy(policy_map); - // Default multi-profile behavior for managed accounts to not-allowed. + // Default multi-profile behavior for managed accounts to primary-only. if (store()->has_policy() && !policy_map->Get(key::kChromeOsMultiProfileUserBehavior)) { policy_map->Set(key::kChromeOsMultiProfileUserBehavior, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - new base::StringValue("not-allowed"), + new base::StringValue("primary-only"), NULL); } } diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc index fb4370e..d25d7dc 100644 --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc @@ -113,7 +113,7 @@ class UserCloudPolicyManagerChromeOSTest : public testing::Test { NULL); policy_map_.Set(key::kChromeOsMultiProfileUserBehavior, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - new base::StringValue("not-allowed"), + new base::StringValue("primary-only"), NULL); expected_bundle_.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) .CopyFrom(policy_map_); diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc index 990356a..238fdd1 100644 --- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc +++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc @@ -140,7 +140,7 @@ void GetExpectedDefaultPolicy(PolicyMap* policy_map) { policy_map->Set(key::kChromeOsMultiProfileUserBehavior, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - new base::StringValue("not-allowed"), + new base::StringValue("primary-only"), NULL); #endif } @@ -176,7 +176,7 @@ void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) { expected->Set(key::kChromeOsMultiProfileUserBehavior, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, - new base::StringValue("not-allowed"), + new base::StringValue("primary-only"), NULL); #endif } |