chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc - Issue 23376002: Move ManagedModePolicyProvider functionality to ManagedUserSettingsService.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

Issue 23376002: Move ManagedModePolicyProvider functionality to ManagedUserSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/managed_mode/managed_mode_browsertest.cc » ('j') | chrome/browser/managed_mode/managed_user_settings_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

index 5314e80c73d3c2e96c34aaa89e3eea2803b1b43c..90da3f8c5521f1593c1c939d559d10598b0c6ffd 100644

--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

@@ -104,12 +104,11 @@ scoped_ptr<UserCloudPolicyManagerChromeOS>

CHECK(user);

// Only USER_TYPE_REGULAR users have user cloud policy.

- // USER_TYPE_RETAIL_MODE, USER_TYPE_KIOSK_APP and USER_TYPE_GUEST are not

- // signed in and can't authenticate the policy registration.

+ // USER_TYPE_RETAIL_MODE, USER_TYPE_KIOSK_APP, USER_TYPE_GUEST and

+ // USER_TYPE_LOCALLY_MANAGED are not signed in and can't authenticate the

+ // policy registration.

// USER_TYPE_PUBLIC_ACCOUNT gets its policy from the

// DeviceLocalAccountPolicyService.

- // USER_TYPE_LOCALLY_MANAGED gets its policy from the

- // ManagedModePolicyProvider.

const std::string& username = user->email();

if (user->GetType() != chromeos::User::USER_TYPE_REGULAR ||

BrowserPolicyConnector::IsNonEnterpriseUser(username)) {