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

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

Issue 2714853002: Remove kDistroDict from Preferences. (Closed)
Patch Set: kRlzPingDelay -> kRlzPingDelaySeconds Created 3 years, 10 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
Index: chrome/browser/prefs/chrome_pref_service_factory.cc
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
index 48ceeea700d79b43bddc1f3b37821f0f613a829d..4e7a23e3a66b5274260c4da737c47690ade707b3 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -8,6 +8,7 @@
#include <stddef.h>
#include <string>
+#include <utility>
#include <vector>
#include "base/bind.h"
@@ -513,9 +514,9 @@ void DisableDomainCheckForTesting() {
bool InitializePrefsFromMasterPrefs(
const base::FilePath& profile_path,
- const base::DictionaryValue& master_prefs) {
+ std::unique_ptr<base::DictionaryValue> master_prefs) {
return CreateProfilePrefStoreManager(profile_path)
- ->InitializePrefsFromMasterPrefs(master_prefs);
+ ->InitializePrefsFromMasterPrefs(std::move(master_prefs));
}
base::Time GetResetTime(Profile* profile) {
« no previous file with comments | « chrome/browser/prefs/chrome_pref_service_factory.h ('k') | chrome/browser/prefs/profile_pref_store_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698