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

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

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Respond to review comments. Created 7 years, 11 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 84e5a637400ef75d6be8aaccf3939d91d9212a69..476ad64822a2f37ce006af68a280ac57446ba354 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.h
+++ b/chrome/browser/prefs/chrome_pref_service_factory.h
@@ -5,6 +5,8 @@
#ifndef CHROME_BROWSER_PREFS_CHROME_PREF_SERVICE_FACTORY_H_
#define CHROME_BROWSER_PREFS_CHROME_PREF_SERVICE_FACTORY_H_
+#include "base/memory/ref_counted.h"
+
namespace base {
class SequencedTaskRunner;
}
@@ -14,7 +16,8 @@ class PolicyService;
}
class FilePath;
-class PrefServiceSimple;
+class PrefRegistry;
+class PrefService;
class PrefServiceSyncable;
class PrefStore;
@@ -28,24 +31,26 @@ namespace chrome_prefs {
// preferences and may be NULL.
// |policy_service| is used as the source for mandatory or recommended
// policies.
+// |pref_registry| keeps the list of registered prefs and their default values.
// If |async| is true, asynchronous version is used.
// Notifies using PREF_INITIALIZATION_COMPLETED in the end. Details is set to
// the created PrefService or NULL if creation has failed. Note, it is
// guaranteed that in asynchronous version initialization happens after this
// function returned.
-PrefServiceSimple* CreateLocalState(
+PrefService* CreateLocalState(
const FilePath& pref_filename,
base::SequencedTaskRunner* pref_io_task_runner,
policy::PolicyService* policy_service,
- PrefStore* extension_prefs,
+ const scoped_refptr<PrefStore>& extension_prefs,
+ const scoped_refptr<PrefRegistry>& pref_registry,
bool async);
PrefServiceSyncable* CreateProfilePrefs(
const FilePath& pref_filename,
base::SequencedTaskRunner* pref_io_task_runner,
policy::PolicyService* policy_service,
- PrefStore* extension_prefs,
+ const scoped_refptr<PrefStore>& extension_prefs,
bool async);
} // namespace chrome_prefs

Powered by Google App Engine
This is Rietveld 408576698