| Index: sync/notifier/invalidation_notifier.h
|
| diff --git a/sync/notifier/invalidation_notifier.h b/sync/notifier/invalidation_notifier.h
|
| index f7361241c00489b55b088c6c8a0e2a3ab6b5ede5..cd1290bfc1d99f922c7180078e178ebc9af86f97 100644
|
| --- a/sync/notifier/invalidation_notifier.h
|
| +++ b/sync/notifier/invalidation_notifier.h
|
| @@ -7,7 +7,7 @@
|
| // up to the invalidation client.
|
| //
|
| // You probably don't want to use this directly; use
|
| -// NonBlockingInvalidationNotifier.
|
| +// NonBlockingInvalidator.
|
|
|
| #ifndef SYNC_NOTIFIER_INVALIDATION_NOTIFIER_H_
|
| #define SYNC_NOTIFIER_INVALIDATION_NOTIFIER_H_
|
| @@ -41,7 +41,7 @@ class InvalidationNotifier
|
| // |invalidation_state_tracker| must be initialized.
|
| InvalidationNotifier(
|
| scoped_ptr<notifier::PushClient> push_client,
|
| - const InvalidationVersionMap& initial_max_invalidation_versions,
|
| + const InvalidationStateMap& initial_invalidation_state_map,
|
| const std::string& invalidation_bootstrap_data,
|
| const WeakHandle<InvalidationStateTracker>&
|
| invalidation_state_tracker,
|
| @@ -54,6 +54,8 @@ class InvalidationNotifier
|
| virtual void UpdateRegisteredIds(InvalidationHandler* handler,
|
| const ObjectIdSet& ids) OVERRIDE;
|
| virtual void UnregisterHandler(InvalidationHandler* handler) OVERRIDE;
|
| + virtual void Acknowledge(const invalidation::ObjectId& id,
|
| + const AckHandle& ack_handle) OVERRIDE;
|
| virtual InvalidatorState GetInvalidatorState() const OVERRIDE;
|
| virtual void SetUniqueId(const std::string& unique_id) OVERRIDE;
|
| virtual void SetStateDeprecated(const std::string& state) OVERRIDE;
|
| @@ -82,7 +84,7 @@ class InvalidationNotifier
|
| InvalidatorRegistrar registrar_;
|
|
|
| // Passed to |invalidation_listener_|.
|
| - const InvalidationVersionMap initial_max_invalidation_versions_;
|
| + const InvalidationStateMap initial_invalidation_state_map_;
|
|
|
| // Passed to |invalidation_listener_|.
|
| const WeakHandle<InvalidationStateTracker>
|
|
|