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

Unified Diff: chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc

Issue 2534433002: Mop up incorrect uses of IsEnterpriseManaged() (Closed)
Patch Set: Harmonize comments between InstallAttributes and BrowserPolicyConnectorChromeOS Created 4 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/login/enrollment/enterprise_enrollment_helper_impl.cc
diff --git a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc
index b4b67ae7b8d17291cf65d3a56ead070ff0053a7d..9e9d683d6742cec3907bec2fe63481ecda71fb01 100644
--- a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc
+++ b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc
@@ -146,7 +146,8 @@ void EnterpriseEnrollmentHelperImpl::DoEnroll(const std::string& token) {
oauth_token_ = token;
policy::BrowserPolicyConnectorChromeOS* connector =
g_browser_process->platform_part()->browser_policy_connector_chromeos();
- if (connector->IsEnterpriseManaged() &&
+ // Re-enrollment not (yet?) supported for Active Directory.
achuithb 2016/11/25 10:10:48 Is this intended to be a TODO? If so, we should ad
Thiemo Nagel 2016/11/25 14:26:10 Good point. It's not intended as a TODO. I've ch
+ if (connector->IsCloudManaged() &&
connector->GetEnterpriseDomain() != enrolling_user_domain_) {
LOG(ERROR) << "Trying to re-enroll to a different domain than "
<< connector->GetEnterpriseDomain();

Powered by Google App Engine
This is Rietveld 408576698