| Index: chrome/browser/chromeos/policy/device_cloud_policy_initializer.h
|
| diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h
|
| index b8b86de0bf2f7225110263f0f00bcf6550190e5b..e06073260c7b115150b2b1331a74a45f5c8c1ae9 100644
|
| --- a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h
|
| +++ b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.h
|
| @@ -13,6 +13,7 @@
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "chrome/browser/chromeos/policy/consumer_management_service.h"
|
| #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"
|
| #include "chrome/browser/chromeos/policy/server_backed_state_keys_broker.h"
|
| #include "components/policy/core/common/cloud/cloud_policy_client.h"
|
| @@ -39,7 +40,9 @@ class EnterpriseInstallAttributes;
|
|
|
| // This class connects DCPM to the correct device management service, and
|
| // handles the enrollment process.
|
| -class DeviceCloudPolicyInitializer : public CloudPolicyStore::Observer {
|
| +class DeviceCloudPolicyInitializer
|
| + : public CloudPolicyStore::Observer,
|
| + public ConsumerManagementService::Observer {
|
| public:
|
| typedef std::bitset<32> AllowedDeviceModes;
|
| typedef base::Callback<void(EnrollmentStatus)> EnrollmentCallback;
|
| @@ -55,7 +58,8 @@ class DeviceCloudPolicyInitializer : public CloudPolicyStore::Observer {
|
| ServerBackedStateKeysBroker* state_keys_broker,
|
| DeviceCloudPolicyStoreChromeOS* device_store,
|
| DeviceCloudPolicyManagerChromeOS* manager,
|
| - chromeos::DeviceSettingsService* device_settings_service);
|
| + chromeos::DeviceSettingsService* device_settings_service,
|
| + ConsumerManagementService* consumer_management_service);
|
|
|
| virtual ~DeviceCloudPolicyInitializer();
|
|
|
| @@ -92,8 +96,11 @@ class DeviceCloudPolicyInitializer : public CloudPolicyStore::Observer {
|
| std::string GetForcedEnrollmentDomain() const;
|
|
|
| // CloudPolicyStore::Observer:
|
| - virtual void OnStoreLoaded(CloudPolicyStore* store) override;
|
| - virtual void OnStoreError(CloudPolicyStore* store) override;
|
| + void OnStoreLoaded(CloudPolicyStore* store) override;
|
| + void OnStoreError(CloudPolicyStore* store) override;
|
| +
|
| + // ConsumerManagementService::Observer:
|
| + void OnConsumerManagementStatusChanged() override;
|
|
|
| private:
|
| // Handles completion signaled by |enrollment_handler_|.
|
| @@ -116,6 +123,7 @@ class DeviceCloudPolicyInitializer : public CloudPolicyStore::Observer {
|
| DeviceCloudPolicyStoreChromeOS* device_store_;
|
| DeviceCloudPolicyManagerChromeOS* manager_;
|
| chromeos::DeviceSettingsService* device_settings_service_;
|
| + ConsumerManagementService* consumer_management_service_;
|
| bool is_initialized_;
|
|
|
| // Non-NULL if there is an enrollment operation pending.
|
|
|