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

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

Issue 145053004: Let chrome_prefs handle Preferences initialization from master_preferences. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add test Created 6 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.h
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.h b/chrome/browser/prefs/chrome_pref_service_factory.h
index c8a119d09a9225429307d10d7421379b38ad362c..2366b4f8d0ae196d6cf02d3410d6d8e41ed24a51 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.h
+++ b/chrome/browser/prefs/chrome_pref_service_factory.h
@@ -9,6 +9,7 @@
#include "base/memory/scoped_ptr.h"
namespace base {
+class DictionaryValue;
class FilePath;
class SequencedTaskRunner;
}
@@ -62,13 +63,19 @@ scoped_ptr<PrefServiceSyncable> CreateProfilePrefs(
const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry,
bool async);
-// Initializes a preference hash store for the profile preferences file at
+// Initializes the |pref_hash_store| for the profile preferences file at
// |pref_filename| without actually loading the profile.
-void InitializeHashStoreForPrefFile(
+void InitializeHashStoreFromPrefFile(
const base::FilePath& pref_filename,
base::SequencedTaskRunner* pref_io_task_runner,
scoped_ptr<PrefHashStore> pref_hash_store);
+// Initializes the |pref_hash_store| via the preference values present in
+// |master_prefs|.
+void InitializeHashStoreFromMasterPrefs(
+ const base::DictionaryValue& master_prefs,
+ scoped_ptr<PrefHashStore> pref_hash_store);
+
} // namespace chrome_prefs
#endif // CHROME_BROWSER_PREFS_CHROME_PREF_SERVICE_FACTORY_H_

Powered by Google App Engine
This is Rietveld 408576698