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 472c97d6ebb02508c0c4a7c5ce2ceebbd554b7dc..50085c00383442dae6acf8d8a4e9f4d477a8cf0b 100644 |
--- a/chrome/browser/policy/cloud/cloud_policy_store.cc |
+++ b/chrome/browser/policy/cloud/cloud_policy_store.cc |
@@ -5,6 +5,8 @@ |
#include "chrome/browser/policy/cloud/cloud_policy_store.h" |
#include "base/hash.h" |
+#include "base/logging.h" |
+#include "chrome/browser/policy/cloud/cloud_external_data_manager.h" |
namespace policy { |
@@ -45,6 +47,12 @@ void CloudPolicyStore::NotifyStoreLoaded() { |
hash_value_ = new_hash_value; |
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)); |
} |
@@ -53,4 +61,12 @@ void CloudPolicyStore::NotifyStoreError() { |
FOR_EACH_OBSERVER(Observer, observers_, OnStoreError(this)); |
} |
+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 |