Index: chrome/browser/policy/browser_policy_connector.cc |
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc |
index 58fb442b246ffa503c09ab5e0accc4414ba074d1..237af81d4de6c668b9f0256b8aa1283405109a18 100644 |
--- a/chrome/browser/policy/browser_policy_connector.cc |
+++ b/chrome/browser/policy/browser_policy_connector.cc |
@@ -195,26 +195,21 @@ std::string BrowserPolicyConnector::GetEnterpriseDomain() { |
return std::string(); |
} |
-void BrowserPolicyConnector::ResetDevicePolicy() { |
+void BrowserPolicyConnector::ResetCloudPolicy() { |
#if defined(OS_CHROMEOS) |
if (device_cloud_policy_subsystem_.get()) |
device_cloud_policy_subsystem_->Reset(); |
+ if (user_cloud_policy_subsystem_.get()) |
+ user_cloud_policy_subsystem_->Reset(); |
#endif |
} |
-void BrowserPolicyConnector::FetchDevicePolicy() { |
+void BrowserPolicyConnector::FetchCloudPolicy() { |
#if defined(OS_CHROMEOS) |
- if (device_data_store_.get()) { |
+ if (device_data_store_.get()) |
device_data_store_->NotifyDeviceTokenChanged(); |
- } |
-#endif |
-} |
- |
-void BrowserPolicyConnector::FetchUserPolicy() { |
-#if defined(OS_CHROMEOS) |
- if (user_data_store_.get()) { |
+ if (user_data_store_.get()) |
user_data_store_->NotifyDeviceTokenChanged(); |
- } |
#endif |
} |
@@ -353,9 +348,11 @@ BrowserPolicyConnector::BrowserPolicyConnector() |
recommended_platform_provider_.reset(CreateRecommendedPlatformProvider()); |
managed_cloud_provider_.reset(new CloudPolicyProviderImpl( |
+ this, |
GetChromePolicyDefinitionList(), |
CloudPolicyCacheBase::POLICY_LEVEL_MANDATORY)); |
recommended_cloud_provider_.reset(new CloudPolicyProviderImpl( |
+ this, |
GetChromePolicyDefinitionList(), |
CloudPolicyCacheBase::POLICY_LEVEL_RECOMMENDED)); |