| Index: chrome/browser/policy/device_cloud_policy_manager_chromeos.cc
|
| diff --git a/chrome/browser/policy/device_cloud_policy_manager_chromeos.cc b/chrome/browser/policy/device_cloud_policy_manager_chromeos.cc
|
| index 9268d1796729a445a4330a966467b188ebe27fae..c90d509b50af44d3f7e0e68ed82719f8ae7c1459 100644
|
| --- a/chrome/browser/policy/device_cloud_policy_manager_chromeos.cc
|
| +++ b/chrome/browser/policy/device_cloud_policy_manager_chromeos.cc
|
| @@ -4,10 +4,13 @@
|
|
|
| #include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h"
|
|
|
| +#include "base/bind.h"
|
| +#include "base/bind_helpers.h"
|
| #include "chrome/browser/chromeos/system/statistics_provider.h"
|
| #include "chrome/browser/policy/cloud_policy_client.h"
|
| #include "chrome/browser/policy/device_cloud_policy_store_chromeos.h"
|
| #include "chrome/browser/policy/device_management_service.h"
|
| +#include "chrome/browser/policy/enrollment_handler_chromeos.h"
|
| #include "chrome/browser/policy/enterprise_install_attributes.h"
|
| #include "chrome/common/pref_names.h"
|
|
|
| @@ -67,10 +70,34 @@ void DeviceCloudPolicyManagerChromeOS::Connect(
|
| StartIfManaged();
|
| }
|
|
|
| +void DeviceCloudPolicyManagerChromeOS::StartEnrollment(
|
| + const std::string& auth_token,
|
| + const AllowedDeviceModes& allowed_device_modes,
|
| + const EnrollmentCallback& callback) {
|
| + CHECK(device_management_service_);
|
| + ShutdownService();
|
| +
|
| + enrollment_handler_.reset(
|
| + new EnrollmentHandlerChromeOS(
|
| + device_store_, install_attributes_, CreateClient(), auth_token,
|
| + allowed_device_modes,
|
| + base::Bind(&DeviceCloudPolicyManagerChromeOS::EnrollmentCompleted,
|
| + base::Unretained(this), callback)));
|
| + enrollment_handler_->StartEnrollment();
|
| +}
|
| +
|
| +void DeviceCloudPolicyManagerChromeOS::CancelEnrollment() {
|
| + if (enrollment_handler_.get()) {
|
| + enrollment_handler_.reset();
|
| + StartIfManaged();
|
| + }
|
| +}
|
| +
|
| void DeviceCloudPolicyManagerChromeOS::OnStoreLoaded(CloudPolicyStore* store) {
|
| CloudPolicyManager::OnStoreLoaded(store);
|
|
|
| - StartIfManaged();
|
| + if (!enrollment_handler_.get())
|
| + StartIfManaged();
|
| }
|
|
|
| // static
|
| @@ -110,6 +137,21 @@ scoped_ptr<CloudPolicyClient> DeviceCloudPolicyManagerChromeOS::CreateClient() {
|
| device_management_service_));
|
| }
|
|
|
| +void DeviceCloudPolicyManagerChromeOS::EnrollmentCompleted(
|
| + const EnrollmentCallback& callback,
|
| + EnrollmentStatus status) {
|
| + if (status.status() == EnrollmentStatus::STATUS_SUCCESS) {
|
| + InitializeService(enrollment_handler_->ReleaseClient());
|
| + StartRefreshScheduler(local_state_, prefs::kDevicePolicyRefreshRate);
|
| + } else {
|
| + StartIfManaged();
|
| + }
|
| +
|
| + enrollment_handler_.reset();
|
| + if (!callback.is_null())
|
| + callback.Run(status);
|
| +}
|
| +
|
| void DeviceCloudPolicyManagerChromeOS::StartIfManaged() {
|
| if (device_management_service_ &&
|
| local_state_ &&
|
|
|