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

Unified Diff: chrome/browser/policy/device_cloud_policy_manager_chromeos.h

Issue 10928036: Implement Chrome OS device enrollment on the new cloud policy stack. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix CloudPolicyClient error handling. Created 8 years, 2 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/policy/device_cloud_policy_manager_chromeos.h
diff --git a/chrome/browser/policy/device_cloud_policy_manager_chromeos.h b/chrome/browser/policy/device_cloud_policy_manager_chromeos.h
index 28f07e6cae893e2a4e3ff357223259c4c37add12..630e06c5dc70e5961563cbb68c4af8fa795254c3 100644
--- a/chrome/browser/policy/device_cloud_policy_manager_chromeos.h
+++ b/chrome/browser/policy/device_cloud_policy_manager_chromeos.h
@@ -5,13 +5,16 @@
#ifndef CHROME_BROWSER_POLICY_DEVICE_CLOUD_POLICY_MANAGER_CHROMEOS_H_
#define CHROME_BROWSER_POLICY_DEVICE_CLOUD_POLICY_MANAGER_CHROMEOS_H_
+#include <bitset>
#include <string>
#include "base/basictypes.h"
+#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/policy/cloud_policy_manager.h"
#include "chrome/browser/policy/cloud_policy_store.h"
+#include "chrome/browser/policy/enrollment_status_chromeos.h"
class PrefService;
@@ -20,11 +23,16 @@ namespace policy {
class CloudPolicyClient;
class DeviceCloudPolicyStoreChromeOS;
class DeviceManagementService;
+class EnrollmentHandlerChromeOS;
class EnterpriseInstallAttributes;
-// CloudPolicyManager specialization for device policy on Chrome OS.
+// CloudPolicyManager specialization for device policy on Chrome OS. The most
+// significant addition is support for device enrollment.
class DeviceCloudPolicyManagerChromeOS : public CloudPolicyManager {
public:
+ typedef std::bitset<32> AllowedDeviceModes;
+ typedef base::Callback<void(EnrollmentStatus)> EnrollmentCallback;
+
DeviceCloudPolicyManagerChromeOS(
scoped_ptr<DeviceCloudPolicyStoreChromeOS> store,
EnterpriseInstallAttributes* install_attributes);
@@ -34,6 +42,17 @@ class DeviceCloudPolicyManagerChromeOS : public CloudPolicyManager {
void Connect(PrefService* local_state,
DeviceManagementService* device_management_service);
+ // Starts enrollment or re-enrollment. Once the enrollment process completes,
+ // |callback| is invoked and gets passed the status of the operation.
+ // |allowed_modes| specifies acceptable DEVICE_MODE_* constants for
+ // enrollment.
+ void StartEnrollment(const std::string& auth_token,
+ const AllowedDeviceModes& allowed_modes,
+ const EnrollmentCallback& callback);
+
+ // Cancels a pending enrollment operation, if any.
+ void CancelEnrollment();
+
// CloudPolicyStore::Observer:
virtual void OnStoreLoaded(CloudPolicyStore* store) OVERRIDE;
@@ -51,6 +70,10 @@ class DeviceCloudPolicyManagerChromeOS : public CloudPolicyManager {
// necessary dependencies have been provided via Initialize().
void StartIfManaged();
+ // Handles completion signaled by |enrollment_handler_|.
+ void EnrollmentCompleted(const EnrollmentCallback& callback,
+ EnrollmentStatus status);
+
// Points to the same object as the base CloudPolicyManager::store(), but with
// actual device policy specific type.
DeviceCloudPolicyStoreChromeOS* device_store_;
@@ -61,6 +84,9 @@ class DeviceCloudPolicyManagerChromeOS : public CloudPolicyManager {
// PrefService instance to read the policy refresh rate from.
PrefService* local_state_;
+ // Non-null if there is an enrollment operation pending.
+ scoped_ptr<EnrollmentHandlerChromeOS> enrollment_handler_;
+
DISALLOW_COPY_AND_ASSIGN(DeviceCloudPolicyManagerChromeOS);
};
« no previous file with comments | « chrome/browser/policy/cloud_policy_client.cc ('k') | chrome/browser/policy/device_cloud_policy_manager_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698