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

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: more alphabetize (and rebase again) 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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 124
125 // |user| should never be NULL except for the signin profile. This object is 125 // |user| should never be NULL except for the signin profile. This object is
126 // created as part of the Profile creation, which happens right after 126 // created as part of the Profile creation, which happens right after
127 // sign-in. The just-signed-in User is the active user during that time. 127 // sign-in. The just-signed-in User is the active user during that time.
128 chromeos::User* user = 128 chromeos::User* user =
129 chromeos::ProfileHelper::Get()->GetUserByProfile(profile); 129 chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
130 CHECK(user); 130 CHECK(user);
131 131
132 // Only USER_TYPE_REGULAR users have user cloud policy. 132 // Only USER_TYPE_REGULAR users have user cloud policy.
133 // USER_TYPE_RETAIL_MODE, USER_TYPE_KIOSK_APP, USER_TYPE_GUEST and 133 // USER_TYPE_RETAIL_MODE, USER_TYPE_KIOSK_APP, USER_TYPE_GUEST and
134 // USER_TYPE_LOCALLY_MANAGED are not signed in and can't authenticate the 134 // USER_TYPE_SUPERVISED are not signed in and can't authenticate the
135 // policy registration. 135 // policy registration.
136 // USER_TYPE_PUBLIC_ACCOUNT gets its policy from the 136 // USER_TYPE_PUBLIC_ACCOUNT gets its policy from the
137 // DeviceLocalAccountPolicyService. 137 // DeviceLocalAccountPolicyService.
138 // Non-managed domains will be skipped by the below check 138 // Non-managed domains will be skipped by the below check
139 const std::string& username = user->email(); 139 const std::string& username = user->email();
140 if (user->GetType() != user_manager::USER_TYPE_REGULAR || 140 if (user->GetType() != user_manager::USER_TYPE_REGULAR ||
141 BrowserPolicyConnector::IsNonEnterpriseUser(username)) { 141 BrowserPolicyConnector::IsNonEnterpriseUser(username)) {
142 return scoped_ptr<UserCloudPolicyManagerChromeOS>(); 142 return scoped_ptr<UserCloudPolicyManagerChromeOS>();
143 } 143 }
144 144
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 252
253 bool UserCloudPolicyManagerFactoryChromeOS::HasTestingFactory( 253 bool UserCloudPolicyManagerFactoryChromeOS::HasTestingFactory(
254 content::BrowserContext* context) { 254 content::BrowserContext* context) {
255 return false; 255 return false;
256 } 256 }
257 257
258 void UserCloudPolicyManagerFactoryChromeOS::CreateServiceNow( 258 void UserCloudPolicyManagerFactoryChromeOS::CreateServiceNow(
259 content::BrowserContext* context) {} 259 content::BrowserContext* context) {}
260 260
261 } // namespace policy 261 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.cc ('k') | chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698