Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(648)

Side by Side Diff: chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h" 5 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 122
123 // |user| should never be NULL except for the signin profile. This object is 123 // |user| should never be NULL except for the signin profile. This object is
124 // created as part of the Profile creation, which happens right after 124 // created as part of the Profile creation, which happens right after
125 // sign-in. The just-signed-in User is the active user during that time. 125 // sign-in. The just-signed-in User is the active user during that time.
126 chromeos::User* user = 126 chromeos::User* user =
127 chromeos::ProfileHelper::Get()->GetUserByProfile(profile); 127 chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
128 CHECK(user); 128 CHECK(user);
129 129
130 // Only USER_TYPE_REGULAR users have user cloud policy. 130 // Only USER_TYPE_REGULAR users have user cloud policy.
131 // USER_TYPE_RETAIL_MODE, USER_TYPE_KIOSK_APP, USER_TYPE_GUEST and 131 // USER_TYPE_RETAIL_MODE, USER_TYPE_KIOSK_APP, USER_TYPE_GUEST and
132 // USER_TYPE_LOCALLY_MANAGED are not signed in and can't authenticate the 132 // USER_TYPE_SUPERVISED are not signed in and can't authenticate the
133 // policy registration. 133 // policy registration.
134 // USER_TYPE_PUBLIC_ACCOUNT gets its policy from the 134 // USER_TYPE_PUBLIC_ACCOUNT gets its policy from the
135 // DeviceLocalAccountPolicyService. 135 // DeviceLocalAccountPolicyService.
136 const std::string& username = user->email(); 136 const std::string& username = user->email();
137 if (user->GetType() != user_manager::USER_TYPE_REGULAR || 137 if (user->GetType() != user_manager::USER_TYPE_REGULAR ||
138 BrowserPolicyConnector::IsNonEnterpriseUser(username)) { 138 BrowserPolicyConnector::IsNonEnterpriseUser(username)) {
139 return scoped_ptr<UserCloudPolicyManagerChromeOS>(); 139 return scoped_ptr<UserCloudPolicyManagerChromeOS>();
140 } 140 }
141 141
142 policy::BrowserPolicyConnectorChromeOS* connector = 142 policy::BrowserPolicyConnectorChromeOS* connector =
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 242
243 bool UserCloudPolicyManagerFactoryChromeOS::HasTestingFactory( 243 bool UserCloudPolicyManagerFactoryChromeOS::HasTestingFactory(
244 content::BrowserContext* context) { 244 content::BrowserContext* context) {
245 return false; 245 return false;
246 } 246 }
247 247
248 void UserCloudPolicyManagerFactoryChromeOS::CreateServiceNow( 248 void UserCloudPolicyManagerFactoryChromeOS::CreateServiceNow(
249 content::BrowserContext* context) {} 249 content::BrowserContext* context) {}
250 250
251 } // namespace policy 251 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698