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

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

Issue 1306183007: Switch to id-based affiliation determination (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
Index: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
index 7005f7f2b3e14715906ea2abf351285fa63c4a47..8ed5b15117cc0615ad93fb295240b7313716b262 100644
--- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
+++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
@@ -284,25 +284,6 @@ EnrollmentConfig BrowserPolicyConnectorChromeOS::GetPrescribedEnrollmentConfig()
return EnrollmentConfig();
}
-UserAffiliation BrowserPolicyConnectorChromeOS::GetUserAffiliation(
- const std::string& user_name) {
- // An empty username means incognito user in case of ChromiumOS and
- // no logged-in user in case of Chromium (SigninService). Many tests use
- // nonsense email addresses (e.g. 'test') so treat those as non-enterprise
- // users.
- if (user_name.empty() || user_name.find('@') == std::string::npos)
- return USER_AFFILIATION_NONE;
-
- if (install_attributes_ &&
- (gaia::ExtractDomainName(gaia::CanonicalizeEmail(user_name)) ==
- install_attributes_->GetDomain() ||
- policy::IsDeviceLocalAccountUser(user_name, NULL))) {
- return USER_AFFILIATION_MANAGED;
- }
-
- return USER_AFFILIATION_NONE;
-}
-
void BrowserPolicyConnectorChromeOS::SetUserPolicyDelegate(
ConfigurationPolicyProvider* user_policy_provider) {
global_user_cloud_policy_provider_->SetDelegate(user_policy_provider);

Powered by Google App Engine
This is Rietveld 408576698