diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 02:34:48 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 02:34:48 +0000 |
| commit | 7800d79ee9ecdfcca77ba895b7679c8f1fb85ee4 (patch) | |
| tree | e56bacac84e7ab2ce10ff5b5adcff85859fdbb38 /chrome/browser/sync/sync_prefs.h | |
| parent | 2404a282786943958a5fce4cd111dfa538ae0a33 (diff) | |
| download | chromium_src-7800d79ee9ecdfcca77ba895b7679c8f1fb85ee4.zip chromium_src-7800d79ee9ecdfcca77ba895b7679c8f1fb85ee4.tar.gz chromium_src-7800d79ee9ecdfcca77ba895b7679c8f1fb85ee4.tar.bz2 | |
sync: move invalidation version prefs out of SyncPrefs into InvalidatorStorage.
De-coupling so we don't add more sync < > invalidations deps while adding support for storing opaque notification state in InvalidationStateTracker.
Added get/setters to InvalidationStateTracker and impl (InvalidatorStorage), but it's not wired up for use yet.
Next step is to add migration code to move state from syncable::Directory to InvalidationStateTracker.
Comment in invalidator_storage.h explains motivations for not moving out of sync. This patch creates the c/b/s/invalidations directory,
which we can move non-profile-sync-specific chrome invalidations code to (such as BridgedSyncNotifier, and the android
related part of ChromeSyncNotificationsBridge).
BUG=124140
TEST=InvalidatorStorageTest, should be no functional changes
Review URL: https://chromiumcodereview.appspot.com/10451058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/sync_prefs.h')
| -rw-r--r-- | chrome/browser/sync/sync_prefs.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/browser/sync/sync_prefs.h b/chrome/browser/sync/sync_prefs.h index d2cc6ad..31d1d183 100644 --- a/chrome/browser/sync/sync_prefs.h +++ b/chrome/browser/sync/sync_prefs.h @@ -45,7 +45,6 @@ class SyncPrefObserver { // sync_setup_wizard_unittest.cc // two_client_preferences_sync_test.cc class SyncPrefs : public base::SupportsWeakPtr<SyncPrefs>, - public sync_notifier::InvalidationStateTracker, public content::NotificationObserver { public: // |pref_service| may be NULL (for unit tests), but in that case no @@ -106,12 +105,6 @@ class SyncPrefs : public base::SupportsWeakPtr<SyncPrefs>, void SetSpareBootstrapToken(const std::string& token); #endif - // InvalidationStateTracker implementation. - virtual sync_notifier::InvalidationVersionMap - GetAllMaxVersions() const OVERRIDE; - virtual void SetMaxVersion(syncable::ModelType model_type, - int64 max_version) OVERRIDE; - // Merges the given set of types with the set of acknowledged types. void AcknowledgeSyncedTypes(syncable::ModelTypeSet types); |