Chromium Code Reviews| 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..8456cb7b642a420f7e70180f6257436339f5a965 100644 |
| --- a/chrome/browser/policy/browser_policy_connector.cc |
| +++ b/chrome/browser/policy/browser_policy_connector.cc |
| @@ -202,20 +202,24 @@ void BrowserPolicyConnector::ResetDevicePolicy() { |
| #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(); |
| - } |
| + if (user_data_store_.get()) |
| + user_data_store_->NotifyDeviceTokenChanged(); |
| #endif |
| } |
| -void BrowserPolicyConnector::FetchUserPolicy() { |
| -#if defined(OS_CHROMEOS) |
| - if (user_data_store_.get()) { |
| - user_data_store_->NotifyDeviceTokenChanged(); |
| - } |
| -#endif |
| +void BrowserPolicyConnector::RefreshPolicies() { |
| + if (managed_platform_provider_.get()) |
| + managed_cloud_provider_->RefreshPolicies(); |
| + if (recommended_platform_provider_.get()) |
| + recommended_cloud_provider_->RefreshPolicies(); |
| + if (managed_cloud_provider_.get()) |
| + managed_cloud_provider_->RefreshPolicies(); |
| + if (recommended_cloud_provider_.get()) |
| + recommended_cloud_provider_->RefreshPolicies(); |
|
Mattias Nissler (ping if slow)
2011/11/18 14:49:32
So here is where we have both cloud providers call
Joao da Silva
2011/11/18 15:39:18
Yes. The 2nd call will cancel the posting of DoWor
|
| } |
| void BrowserPolicyConnector::ScheduleServiceInitialization( |
| @@ -353,9 +357,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)); |