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

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

Issue 10449071: Enable user policy handling through the new cloud policy stack. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 years, 7 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/browser_policy_connector.h
diff --git a/chrome/browser/policy/browser_policy_connector.h b/chrome/browser/policy/browser_policy_connector.h
index 2c524726c0908dc744d7ffb3e83ace6d9c9ee3ec..dd7a244e35c759ab94ebcafa97cb96d85329a89e 100644
--- a/chrome/browser/policy/browser_policy_connector.h
+++ b/chrome/browser/policy/browser_policy_connector.h
@@ -27,7 +27,9 @@ class CloudPolicyDataStore;
class CloudPolicyProvider;
class CloudPolicySubsystem;
class ConfigurationPolicyProvider;
+class DeviceManagementService;
class PolicyService;
+class UserCloudPolicyManager;
class UserPolicyTokenCache;
// Manages the lifecycle of browser-global policy infrastructure, such as the
@@ -169,6 +171,13 @@ class BrowserPolicyConnector : public content::NotificationObserver {
scoped_ptr<CloudPolicyDataStore> user_data_store_;
scoped_ptr<CloudPolicySubsystem> user_cloud_policy_subsystem_;
+ // Components of the new-style cloud policy implementation.
+ // TODO(mnissler): Remove the old-style components above once we have
+ // completed the switch to the new cloud policy implementation.
+ scoped_ptr<DeviceManagementService> device_management_service_;
+
+ scoped_ptr<UserCloudPolicyManager> user_cloud_policy_manager_;
+
// Used to initialize the device policy subsystem once the message loops
// are spinning.
base::WeakPtrFactory<BrowserPolicyConnector> weak_ptr_factory_;

Powered by Google App Engine
This is Rietveld 408576698