Index: services/preferences/public/cpp/persistent_pref_store_client.h |
diff --git a/services/preferences/public/cpp/persistent_pref_store_client.h b/services/preferences/public/cpp/persistent_pref_store_client.h |
index 7a1a29ab136f82d55d8a339f41d660049b462bd3..0d77a9d2f7443ebbb2e29efadae1a6442d932d3d 100644 |
--- a/services/preferences/public/cpp/persistent_pref_store_client.h |
+++ b/services/preferences/public/cpp/persistent_pref_store_client.h |
@@ -15,9 +15,10 @@ |
namespace base { |
class Value; |
-class DictionaryValue; |
} |
+class PrefRegistry; |
+ |
namespace prefs { |
// An implementation of PersistentPrefStore backed by a |
@@ -25,8 +26,11 @@ namespace prefs { |
class PersistentPrefStoreClient |
: public PrefStoreClientMixin<PersistentPrefStore> { |
public: |
+ PersistentPrefStoreClient(mojom::PrefStoreConnectorPtr connector, |
+ scoped_refptr<PrefRegistry> pref_registry); |
+ |
explicit PersistentPrefStoreClient( |
- mojom::PersistentPrefStoreConnectorPtr connector); |
+ mojom::PersistentPrefStoreConnectionPtr connection); |
// WriteablePrefStore: |
void SetValue(const std::string& key, |
@@ -53,13 +57,13 @@ class PersistentPrefStoreClient |
~PersistentPrefStoreClient() override; |
private: |
- void OnCreateComplete(PrefReadError read_error, |
- bool read_only, |
- std::unique_ptr<base::DictionaryValue> cached_prefs, |
- mojom::PersistentPrefStorePtr pref_store, |
- mojom::PrefStoreObserverRequest observer_request); |
+ void OnCreateComplete(mojom::PersistentPrefStoreConnectionPtr connection, |
+ std::unordered_map<PrefValueStore::PrefStoreType, |
+ prefs::mojom::PrefStoreConnectionPtr> |
+ other_pref_stores); |
- mojom::PersistentPrefStoreConnectorPtr connector_; |
+ mojom::PrefStoreConnectorPtr connector_; |
+ scoped_refptr<PrefRegistry> pref_registry_; |
bool read_only_ = false; |
PrefReadError read_error_ = PersistentPrefStore::PREF_READ_ERROR_NONE; |
mojom::PersistentPrefStorePtr pref_store_; |