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

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

Issue 2677563005: Chromad: Use DM server reply to determine enrollment type (Closed)
Patch Set: Created 3 years, 10 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/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 a7495932aec90e8618c9f6dc81cd075517f223c7..6b2ca910a78e30da5def27e88c93ba5739cb7800 100644
--- a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc
+++ b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc
@@ -169,16 +169,15 @@ void EnterpriseEnrollmentHelperImpl::DoEnroll(const std::string& token) {
}
void EnterpriseEnrollmentHelperImpl::GetDeviceAttributeUpdatePermission() {
- // Don't update device attributes for Active Directory management.
- if (!enrollment_config_.management_realm.empty()) {
- OnDeviceAttributeUpdatePermission(false);
- return;
- }
-
// TODO(pbond): remove this LOG once http://crbug.com/586961 is fixed.
LOG(WARNING) << "Get device attribute update permission";
policy::BrowserPolicyConnectorChromeOS* connector =
g_browser_process->platform_part()->browser_policy_connector_chromeos();
+ // Don't update device attributes for Active Directory management.
+ if (connector->IsActiveDirectoryManaged()) {
+ OnDeviceAttributeUpdatePermission(false);
+ return;
+ }
policy::DeviceCloudPolicyManagerChromeOS* policy_manager =
connector->GetDeviceCloudPolicyManager();
policy::CloudPolicyClient* client = policy_manager->core()->client();

Powered by Google App Engine
This is Rietveld 408576698