Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5472)

Unified Diff: chrome/browser/prefs/active_profile_pref_service.h

Issue 2791903003: Pref service: have Mash and Chrome connect to the right pref stores (Closed)
Patch Set: ProfilePrefStoreManagerTest: explicit list stores to connect to Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell.cc ('k') | chrome/browser/prefs/active_profile_pref_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/active_profile_pref_service.h
diff --git a/chrome/browser/prefs/active_profile_pref_service.h b/chrome/browser/prefs/active_profile_pref_service.h
index a5ffacc20d9a231b75f0480b4704f61179852b30..7c661b4aaec1b21c752739f43519225c0acc477c 100644
--- a/chrome/browser/prefs/active_profile_pref_service.h
+++ b/chrome/browser/prefs/active_profile_pref_service.h
@@ -5,7 +5,10 @@
#ifndef CHROME_BROWSER_PREFS_ACTIVE_PROFILE_PREF_SERVICE_H_
#define CHROME_BROWSER_PREFS_ACTIVE_PROFILE_PREF_SERVICE_H_
+#include <vector>
+
#include "base/macros.h"
+#include "components/prefs/pref_value_store.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "services/preferences/public/interfaces/preferences.mojom.h"
#include "services/service_manager/public/cpp/interface_factory.h"
@@ -27,8 +30,10 @@ class ActiveProfilePrefService : public prefs::mojom::PrefStoreConnector,
private:
// prefs::mojom::PrefStoreConnector:
- void Connect(prefs::mojom::PrefRegistryPtr pref_registry,
- const ConnectCallback& callback) override;
+ void Connect(
+ prefs::mojom::PrefRegistryPtr pref_registry,
+ const std::vector<PrefValueStore::PrefStoreType>& already_connected_types,
+ const ConnectCallback& callback) override;
// service_manager::InterfaceFactory<PrefStoreConnector>:
void Create(const service_manager::Identity& remote_identity,
« no previous file with comments | « ash/shell.cc ('k') | chrome/browser/prefs/active_profile_pref_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698