summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs/pref_service_syncable.h
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-14 00:59:24 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-14 00:59:24 +0000
commit57f6212707a418941288c5f127535755e0dbeb17 (patch)
tree57f15c633bcdcf7913d7bbb2f56b1e19f70306a5 /chrome/browser/prefs/pref_service_syncable.h
parent2d35427a69646db860a73563f25ae51ab79050bb (diff)
downloadchromium_src-57f6212707a418941288c5f127535755e0dbeb17.zip
chromium_src-57f6212707a418941288c5f127535755e0dbeb17.tar.gz
chromium_src-57f6212707a418941288c5f127535755e0dbeb17.tar.bz2
prefs: Rename PrefServiceObserver to PrefServiceSyncableObserver.
Note: This was a TODO for joi@. BUG=155525 R=joi@chromium.org TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/11778109 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176616 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/pref_service_syncable.h')
-rw-r--r--chrome/browser/prefs/pref_service_syncable.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/prefs/pref_service_syncable.h b/chrome/browser/prefs/pref_service_syncable.h
index 0360772..c0da135 100644
--- a/chrome/browser/prefs/pref_service_syncable.h
+++ b/chrome/browser/prefs/pref_service_syncable.h
@@ -8,8 +8,7 @@
#include "chrome/browser/prefs/pref_model_associator.h"
#include "chrome/browser/prefs/pref_service.h"
-// TODO(joi) Move to c/b/prefs and rename PrefServiceSyncableObserver.
-class PrefServiceObserver;
+class PrefServiceSyncableObserver;
namespace syncer {
class SyncableService;
@@ -53,8 +52,8 @@ class PrefServiceSyncable : public PrefService {
// identical if a change is in flight (from either side).
bool IsSyncing();
- void AddObserver(PrefServiceObserver* observer);
- void RemoveObserver(PrefServiceObserver* observer);
+ void AddObserver(PrefServiceSyncableObserver* observer);
+ void RemoveObserver(PrefServiceSyncableObserver* observer);
virtual void UnregisterPreference(const char* path) OVERRIDE;
@@ -128,7 +127,7 @@ class PrefServiceSyncable : public PrefService {
PrefModelAssociator pref_sync_associator_;
- ObserverList<PrefServiceObserver> observer_list_;
+ ObserverList<PrefServiceSyncableObserver> observer_list_;
DISALLOW_COPY_AND_ASSIGN(PrefServiceSyncable);
};