| Index: chrome/browser/policy/device_management_policy_provider.h
|
| diff --git a/chrome/browser/policy/device_management_policy_provider.h b/chrome/browser/policy/device_management_policy_provider.h
|
| index 592df9b9c709795b35cb78596ef0ecd087d2a7d7..dd0962825b33dafc2d68dc381ef831ab4b643226 100644
|
| --- a/chrome/browser/policy/device_management_policy_provider.h
|
| +++ b/chrome/browser/policy/device_management_policy_provider.h
|
| @@ -21,8 +21,8 @@ class TokenService;
|
|
|
| namespace policy {
|
|
|
| +class CloudPolicyCache;
|
| class DeviceManagementBackend;
|
| -class DeviceManagementPolicyCache;
|
|
|
| // Provides policy fetched from the device management server. With the exception
|
| // of the Provide method, which can be called on the FILE thread, all public
|
| @@ -44,7 +44,9 @@ class DeviceManagementPolicyProvider
|
|
|
| // DevicePolicyResponseDelegate implementation:
|
| virtual void HandlePolicyResponse(
|
| - const em::DevicePolicyResponse& response);
|
| + const em::DevicePolicyResponse& response); // deprecated.
|
| + virtual void HandleCloudPolicyResponse(
|
| + const em::CloudPolicyResponse& response);
|
| virtual void OnError(DeviceManagementBackend::ErrorCode code);
|
|
|
| // DeviceTokenFetcher::Observer implementation:
|
| @@ -146,7 +148,8 @@ class DeviceManagementPolicyProvider
|
|
|
| scoped_ptr<DeviceManagementBackend> backend_;
|
| Profile* profile_; // weak
|
| - scoped_ptr<DeviceManagementPolicyCache> cache_;
|
| + scoped_ptr<CloudPolicyCache> cache_;
|
| + bool fallback_to_old_protocol_;
|
| scoped_refptr<DeviceTokenFetcher> token_fetcher_;
|
| DeviceTokenFetcher::ObserverRegistrar registrar_;
|
| ObserverList<ConfigurationPolicyProvider::Observer, true> observer_list_;
|
|
|