diff options
author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-22 17:24:44 +0000 |
---|---|---|
committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-22 17:24:44 +0000 |
commit | 5b19952e27008d9cca170c1a517987795d145928 (patch) | |
tree | 34fea6a6f74a0388c68c4ba8cd8846f3ac879027 /chrome/browser/extensions/component_loader.h | |
parent | 96828ec57f67f91b3b1b2269963680501a6de4b9 (diff) | |
download | chromium_src-5b19952e27008d9cca170c1a517987795d145928.zip chromium_src-5b19952e27008d9cca170c1a517987795d145928.tar.gz chromium_src-5b19952e27008d9cca170c1a517987795d145928.tar.bz2 |
Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.
The first two (PrefServiceSimple is a subclass of PrefService) know
nothing about sync or any Chrome or content concepts.
The third (PrefServiceSyncable, a separate subclass of PrefService)
knows about sync and requires users to choose whether each individual
preference is syncable or not when it is registered.
BrowserProcess::local_state() is a PrefServiceSimple after this
change, and Profile::prefs() is a PrefServiceSyncable.
COLLABORATOR=kaiwang@chromium.org
TBR=ben@chromium.org
BUG=155525
Review URL: https://chromiumcodereview.appspot.com/11570009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174531 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/component_loader.h')
-rw-r--r-- | chrome/browser/extensions/component_loader.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h index 7e61e0b..e5ec028 100644 --- a/chrome/browser/extensions/component_loader.h +++ b/chrome/browser/extensions/component_loader.h @@ -14,7 +14,8 @@ #include "base/values.h" class ExtensionServiceInterface; -class PrefService; +class PrefServiceBase; +class PrefServiceSyncable; namespace extensions { @@ -24,8 +25,8 @@ class Extension; class ComponentLoader { public: ComponentLoader(ExtensionServiceInterface* extension_service, - PrefService* prefs, - PrefService* local_state); + PrefServiceBase* prefs, + PrefServiceBase* local_state); virtual ~ComponentLoader(); size_t registered_extensions_count() const { @@ -88,7 +89,7 @@ class ComponentLoader { // platforms this |skip_session_components| is expected to be unset. void AddDefaultComponentExtensions(bool skip_session_components); - static void RegisterUserPrefs(PrefService* prefs); + static void RegisterUserPrefs(PrefServiceSyncable* prefs); // Parse the given JSON manifest. Returns NULL if it cannot be parsed, or if // if the result is not a DictionaryValue. @@ -139,8 +140,8 @@ class ComponentLoader { // Unloads |component| from the memory. void UnloadComponent(ComponentExtensionInfo* component); - PrefService* prefs_; - PrefService* local_state_; + PrefServiceBase* profile_prefs_; + PrefServiceBase* local_state_; ExtensionServiceInterface* extension_service_; |