Chromium Code Reviews| Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc |
| 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 1dc5111a831da02dbb6aa0803d86b10b3bb914a5..16a2ca7bc46f9194f532fe8ebfe099faad7c6001 100644 |
| --- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc |
| +++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc |
| @@ -280,15 +280,10 @@ void UserCloudPolicyManagerChromeOS::OnComponentCloudPolicyUpdated() { |
| void UserCloudPolicyManagerChromeOS::GetChromePolicy(PolicyMap* policy_map) { |
| CloudPolicyManager::GetChromePolicy(policy_map); |
| - // 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("primary-only"), |
| - NULL); |
| - } |
| + if (!store()->has_policy()) |
| + return; |
| + |
| + SetEnterpriseUsersDefaults(policy_map); |
|
Joao da Silva
2014/08/29 09:11:42
Add a comment here explaining what we're doing. Su
merkulova
2014/08/29 14:02:52
Done.
|
| } |
| void UserCloudPolicyManagerChromeOS::FetchPolicyOAuthTokenUsingSigninProfile() { |