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

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

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 | « chrome/browser/prefs/active_profile_pref_service.h ('k') | chrome/browser/prefs/browser_prefs.h » ('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.cc
diff --git a/chrome/browser/prefs/active_profile_pref_service.cc b/chrome/browser/prefs/active_profile_pref_service.cc
index 9168ebf231e66c3dc88b46c8de8ba0340453c09c..bafda8eec02a600352f9a6c2aeb2cab083366c2d 100644
--- a/chrome/browser/prefs/active_profile_pref_service.cc
+++ b/chrome/browser/prefs/active_profile_pref_service.cc
@@ -16,13 +16,15 @@ ActiveProfilePrefService::~ActiveProfilePrefService() = default;
void ActiveProfilePrefService::Connect(
prefs::mojom::PrefRegistryPtr pref_registry,
+ const std::vector<PrefValueStore::PrefStoreType>& already_connected_types,
const ConnectCallback& callback) {
auto* connector = content::BrowserContext::GetConnectorFor(
ProfileManager::GetActiveUserProfile());
connector->BindInterface(prefs::mojom::kServiceName, &connector_ptr_);
connector_ptr_.set_connection_error_handler(base::Bind(
&ActiveProfilePrefService::OnConnectError, base::Unretained(this)));
- connector_ptr_->Connect(std::move(pref_registry), callback);
+ connector_ptr_->Connect(std::move(pref_registry), already_connected_types,
+ callback);
}
void ActiveProfilePrefService::Create(
« no previous file with comments | « chrome/browser/prefs/active_profile_pref_service.h ('k') | chrome/browser/prefs/browser_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698