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

Unified Diff: chrome/browser/extensions/component_loader.h

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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/extensions/component_loader.h
diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h
index 7e61e0bd652ecb2f4d0a5a349b545ed11b75f934..e5ec028cbf70be9a3f7d72268c95090abaf6aed1 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_;
« no previous file with comments | « chrome/browser/extensions/app_notify_channel_setup_unittest.cc ('k') | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698