| Index: chrome/browser/policy/cloud/cloud_policy_store.cc
|
| diff --git a/chrome/browser/policy/cloud/cloud_policy_store.cc b/chrome/browser/policy/cloud/cloud_policy_store.cc
|
| index 2205fb4922b1a58740848ce5c567eb1862af2b13..e3ad95419f296a34697555729fa2a9ee03640a72 100644
|
| --- a/chrome/browser/policy/cloud/cloud_policy_store.cc
|
| +++ b/chrome/browser/policy/cloud/cloud_policy_store.cc
|
| @@ -4,6 +4,9 @@
|
|
|
| #include "chrome/browser/policy/cloud/cloud_policy_store.h"
|
|
|
| +#include "base/logging.h"
|
| +#include "chrome/browser/policy/cloud/cloud_external_data_manager.h"
|
| +
|
| namespace policy {
|
|
|
| CloudPolicyStore::Observer::~Observer() {}
|
| @@ -25,6 +28,12 @@ void CloudPolicyStore::RemoveObserver(CloudPolicyStore::Observer* observer) {
|
|
|
| void CloudPolicyStore::NotifyStoreLoaded() {
|
| is_initialized_ = true;
|
| + // The |external_data_manager_| must be notified first so that when other
|
| + // observers are informed about the changed policies and try to fetch external
|
| + // data referenced by these, the |external_data_manager_| has the required
|
| + // metadata already.
|
| + if (external_data_manager_)
|
| + external_data_manager_->OnPolicyStoreLoaded();
|
| FOR_EACH_OBSERVER(Observer, observers_, OnStoreLoaded(this));
|
| }
|
|
|
| @@ -33,4 +42,12 @@ void CloudPolicyStore::NotifyStoreError() {
|
| FOR_EACH_OBSERVER(Observer, observers_, OnStoreError(this));
|
| }
|
|
|
| -} // namespace
|
| +void CloudPolicyStore::SetExternalDataManager(
|
| + base::WeakPtr<CloudExternalDataManager> external_data_manager) {
|
| + DCHECK(!external_data_manager_);
|
| + external_data_manager_ = external_data_manager;
|
| + if (is_initialized_)
|
| + external_data_manager_->OnPolicyStoreLoaded();
|
| +}
|
| +
|
| +} // namespace policy
|
|
|