Chromium Code Reviews| Index: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h |
| diff --git a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h |
| index 8c01d5b6b99e70da165f321fa869eee32b3eecbc..ce135d6fbff348c45653d08e284c262471c60808 100644 |
| --- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h |
| +++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h |
| @@ -24,6 +24,7 @@ class URLRequestContextGetter; |
| namespace policy { |
| class AppPackUpdater; |
| +class ConsumerManagementService; |
| class DeviceCloudPolicyInitializer; |
| class DeviceCloudPolicyInvalidator; |
| class DeviceCloudPolicyManagerChromeOS; |
| @@ -105,10 +106,14 @@ class BrowserPolicyConnectorChromeOS : public ChromeBrowserPolicyConnector { |
| void SetUserPolicyDelegate(ConfigurationPolicyProvider* user_policy_provider); |
| // Returns the device management service for consumer management. |
| - DeviceManagementService* consumer_device_management_service() const { |
| + DeviceManagementService* GetConsumerDeviceManagementService() const { |
| return consumer_device_management_service_.get(); |
| } |
| + ConsumerManagementService* GetConsumerManagementService() const { |
|
bartfab (slow)
2014/08/04 18:44:50
This is pretty confusing now. We have GetConsumerD
davidyu
2014/08/05 07:26:58
Done.
|
| + return consumer_management_service_.get(); |
| + } |
| + |
| // Sets the install attributes for testing. Must be called before the browser |
| // is created. RemoveInstallAttributesForTesting must be called after the test |
| // to free the attributes. |
| @@ -146,6 +151,7 @@ class BrowserPolicyConnectorChromeOS : public ChromeBrowserPolicyConnector { |
| scoped_ptr<NetworkConfigurationUpdater> network_configuration_updater_; |
| scoped_ptr<DeviceManagementService> consumer_device_management_service_; |
| + scoped_ptr<ConsumerManagementService> consumer_management_service_; |
| base::WeakPtrFactory<BrowserPolicyConnectorChromeOS> weak_ptr_factory_; |