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

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

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
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 6058ba9260c3a08ca2a682694e19e4f172df1249..64735fd018c61cd0050c5b728bbc4fb1645c647f 100644
--- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
+++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
@@ -272,18 +272,18 @@ EnrollmentConfig BrowserPolicyConnectorChromeOS::GetPrescribedEnrollmentConfig()
}
UserAffiliation BrowserPolicyConnectorChromeOS::GetUserAffiliation(
- const std::string& user_name) {
+ const user_manager::UserID& user_id) {
// 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)
+ if (user_id.GetUserEmail().empty() || user_id.GetUserEmail().find('@') == std::string::npos)
return USER_AFFILIATION_NONE;
if (install_attributes_ &&
- (gaia::ExtractDomainName(gaia::CanonicalizeEmail(user_name)) ==
+ (gaia::ExtractDomainName(gaia::CanonicalizeEmail(user_id.GetUserEmail())) ==
install_attributes_->GetDomain() ||
- policy::IsDeviceLocalAccountUser(user_name, NULL))) {
+ policy::IsDeviceLocalAccountUser(user_id, NULL))) {
return USER_AFFILIATION_MANAGED;
}

Powered by Google App Engine
This is Rietveld 408576698