Chromium Code Reviews| Index: chrome/browser/policy/async_policy_loader.cc |
| diff --git a/chrome/browser/policy/async_policy_loader.cc b/chrome/browser/policy/async_policy_loader.cc |
| index 13e23e2d19b96b30e83fb08f2828cf5ef133c891..f7357b076f0c10466ac2fa9acd6bc4557620e746 100644 |
| --- a/chrome/browser/policy/async_policy_loader.cc |
| +++ b/chrome/browser/policy/async_policy_loader.cc |
| @@ -55,10 +55,24 @@ void AsyncPolicyLoader::Reload(bool force) { |
| return; |
| } |
| + // Filter out mismatching policies. |
| + for (DescriptorMap::iterator it = descriptor_map_.begin(); |
| + it != descriptor_map_.end(); ++it) { |
| + it->second->FilterBundle(bundle.get()); |
|
Mattias Nissler (ping if slow)
2013/05/15 10:24:06
I don't think this is a good idea - the idea was t
Joao da Silva
2013/05/19 13:17:55
Note that this only applies to non-CHROME policy,
|
| + } |
| + |
| update_callback_.Run(bundle.Pass()); |
| ScheduleNextReload(TimeDelta::FromSeconds(kReloadIntervalSeconds)); |
| } |
| +void AsyncPolicyLoader::RegisterPolicyDomain( |
| + scoped_refptr<const PolicyDomainDescriptor> descriptor) { |
| + if (descriptor->domain() != POLICY_DOMAIN_CHROME) { |
| + descriptor_map_[descriptor->domain()] = descriptor; |
| + Reload(true); |
| + } |
| +} |
| + |
| scoped_ptr<PolicyBundle> AsyncPolicyLoader::InitialLoad() { |
| // This is the first load, early during startup. Use this to record the |
| // initial |last_modification_time_|, so that potential changes made before |