| Index: chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc
|
| index b3bfde5f21bf78f3fa2c780e86239b174fc0ab6d..9bff11b18c16f718b2ba948bb60337b12c0a793e 100644
|
| --- a/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc
|
| +++ b/chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.cc
|
| @@ -32,6 +32,7 @@ DeviceCloudPolicyStoreChromeOS::DeviceCloudPolicyStoreChromeOS(
|
| enrollment_validation_done_(false),
|
| weak_factory_(this) {
|
| device_settings_service_->AddObserver(this);
|
| + device_settings_service_->SetDeviceMode(install_attributes_->GetMode());
|
| }
|
|
|
| DeviceCloudPolicyStoreChromeOS::~DeviceCloudPolicyStoreChromeOS() {
|
| @@ -155,7 +156,8 @@ void DeviceCloudPolicyStoreChromeOS::UpdateFromService() {
|
| case chromeos::DeviceSettingsService::STORE_NO_POLICY:
|
| case chromeos::DeviceSettingsService::STORE_INVALID_POLICY:
|
| case chromeos::DeviceSettingsService::STORE_VALIDATION_ERROR: {
|
| - if (!enrollment_validation_done_) {
|
| + if (!enrollment_validation_done_ &&
|
| + install_attributes_->GetMode() != DEVICE_MODE_ENTERPRISE_AD) {
|
| enrollment_validation_done_ = true;
|
| const bool has_dm_token =
|
| status == chromeos::DeviceSettingsService::STORE_SUCCESS &&
|
|
|