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

Unified Diff: chrome/browser/sync/sync_prefs.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
« no previous file with comments | « chrome/browser/sync/profile_sync_service_preference_unittest.cc ('k') | chrome/browser/sync/sync_prefs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sync_prefs.h
diff --git a/chrome/browser/sync/sync_prefs.h b/chrome/browser/sync/sync_prefs.h
index bd41e9cc22b90b460b5f81231547b71d59340aed..5650086c33abda8f9d1ec3ef10a718843828f240 100644
--- a/chrome/browser/sync/sync_prefs.h
+++ b/chrome/browser/sync/sync_prefs.h
@@ -15,7 +15,7 @@
#include "sync/internal_api/public/base/model_type.h"
#include "sync/notifier/invalidation_state_tracker.h"
-class PrefService;
+class PrefServiceSyncable;
namespace browser_sync {
@@ -48,7 +48,7 @@ class SyncPrefs : NON_EXPORTED_BASE(public base::NonThreadSafe),
// |pref_service| may be NULL (for unit tests), but in that case no
// setter methods should be called. Does not take ownership of
// |pref_service|.
- explicit SyncPrefs(PrefService* pref_service);
+ explicit SyncPrefs(PrefServiceSyncable* pref_service);
virtual ~SyncPrefs();
@@ -137,7 +137,7 @@ class SyncPrefs : NON_EXPORTED_BASE(public base::NonThreadSafe),
void OnSyncManagedPrefChanged();
// May be NULL.
- PrefService* const pref_service_;
+ PrefServiceSyncable* const pref_service_;
ObserverList<SyncPrefObserver> sync_pref_observers_;
« no previous file with comments | « chrome/browser/sync/profile_sync_service_preference_unittest.cc ('k') | chrome/browser/sync/sync_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698