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

Unified Diff: chrome/browser/sync/profile_sync_service.h

Issue 10826156: Plumb invalidations from Tango to the extensions code for the Push Messaging API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix gmock and maybe Android build Created 8 years, 4 months 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/sync/profile_sync_service.h
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index 3e3e14c44f89d32ea2b5753f4d6710119f068f1c..c64ad817d82102f7dc34f2fc0827ec5207cd7eda 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -24,6 +24,7 @@
#include "chrome/browser/sync/glue/data_type_controller.h"
#include "chrome/browser/sync/glue/data_type_manager.h"
#include "chrome/browser/sync/glue/sync_backend_host.h"
+#include "chrome/browser/sync/invalidation_service.h"
#include "chrome/browser/sync/invalidations/invalidator_storage.h"
#include "chrome/browser/sync/profile_sync_service_observer.h"
#include "chrome/browser/sync/sync_prefs.h"
@@ -151,7 +152,8 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
public browser_sync::SyncPrefObserver,
public syncer::UnrecoverableErrorHandler,
public content::NotificationObserver,
- public ProfileKeyedService {
+ public ProfileKeyedService,
+ public InvalidationService {
public:
typedef ProfileSyncServiceObserver Observer;
typedef browser_sync::SyncBackendHost::Status Status;
@@ -558,8 +560,9 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
//
// The handler -> registered ids map is persisted across restarts of
// sync.
- void UpdateRegisteredInvalidationIds(syncer::SyncNotifierObserver* handler,
- const syncer::ObjectIdSet& ids);
+ virtual void UpdateRegisteredInvalidationIds(
+ syncer::SyncNotifierObserver* handler,
+ const syncer::ObjectIdSet& ids) OVERRIDE;
// ProfileKeyedService implementation.
virtual void Shutdown() OVERRIDE;

Powered by Google App Engine
This is Rietveld 408576698