| Index: components/invalidation/sync_invalidation_listener.h
|
| diff --git a/components/invalidation/sync_invalidation_listener.h b/components/invalidation/sync_invalidation_listener.h
|
| index 2f227731aa695ae6128a26a0a39065dca97b4203..37fa7f104757160a2b479439312f2ef635baaeda 100644
|
| --- a/components/invalidation/sync_invalidation_listener.h
|
| +++ b/components/invalidation/sync_invalidation_listener.h
|
| @@ -68,7 +68,7 @@ class INVALIDATION_EXPORT_PRIVATE SyncInvalidationListener
|
| scoped_ptr<SyncNetworkChannel> network_channel);
|
|
|
| // Calls Stop().
|
| - virtual ~SyncInvalidationListener();
|
| + ~SyncInvalidationListener() override;
|
|
|
| // Does not take ownership of |delegate| or |state_writer|.
|
| // |invalidation_state_tracker| must be initialized.
|
| @@ -91,49 +91,41 @@ class INVALIDATION_EXPORT_PRIVATE SyncInvalidationListener
|
| void UpdateRegisteredIds(const ObjectIdSet& ids);
|
|
|
| // invalidation::InvalidationListener implementation.
|
| - virtual void Ready(
|
| - invalidation::InvalidationClient* client) override;
|
| - virtual void Invalidate(
|
| - invalidation::InvalidationClient* client,
|
| - const invalidation::Invalidation& invalidation,
|
| - const invalidation::AckHandle& ack_handle) override;
|
| - virtual void InvalidateUnknownVersion(
|
| + void Ready(invalidation::InvalidationClient* client) override;
|
| + void Invalidate(invalidation::InvalidationClient* client,
|
| + const invalidation::Invalidation& invalidation,
|
| + const invalidation::AckHandle& ack_handle) override;
|
| + void InvalidateUnknownVersion(
|
| invalidation::InvalidationClient* client,
|
| const invalidation::ObjectId& object_id,
|
| const invalidation::AckHandle& ack_handle) override;
|
| - virtual void InvalidateAll(
|
| - invalidation::InvalidationClient* client,
|
| - const invalidation::AckHandle& ack_handle) override;
|
| - virtual void InformRegistrationStatus(
|
| + void InvalidateAll(invalidation::InvalidationClient* client,
|
| + const invalidation::AckHandle& ack_handle) override;
|
| + void InformRegistrationStatus(
|
| invalidation::InvalidationClient* client,
|
| const invalidation::ObjectId& object_id,
|
| invalidation::InvalidationListener::RegistrationState reg_state) override;
|
| - virtual void InformRegistrationFailure(
|
| - invalidation::InvalidationClient* client,
|
| - const invalidation::ObjectId& object_id,
|
| - bool is_transient,
|
| - const std::string& error_message) override;
|
| - virtual void ReissueRegistrations(
|
| - invalidation::InvalidationClient* client,
|
| - const std::string& prefix,
|
| - int prefix_length) override;
|
| - virtual void InformError(
|
| - invalidation::InvalidationClient* client,
|
| - const invalidation::ErrorInfo& error_info) override;
|
| + void InformRegistrationFailure(invalidation::InvalidationClient* client,
|
| + const invalidation::ObjectId& object_id,
|
| + bool is_transient,
|
| + const std::string& error_message) override;
|
| + void ReissueRegistrations(invalidation::InvalidationClient* client,
|
| + const std::string& prefix,
|
| + int prefix_length) override;
|
| + void InformError(invalidation::InvalidationClient* client,
|
| + const invalidation::ErrorInfo& error_info) override;
|
|
|
| // AckHandler implementation.
|
| - virtual void Acknowledge(
|
| - const invalidation::ObjectId& id,
|
| - const syncer::AckHandle& handle) override;
|
| - virtual void Drop(
|
| - const invalidation::ObjectId& id,
|
| - const syncer::AckHandle& handle) override;
|
| + void Acknowledge(const invalidation::ObjectId& id,
|
| + const syncer::AckHandle& handle) override;
|
| + void Drop(const invalidation::ObjectId& id,
|
| + const syncer::AckHandle& handle) override;
|
|
|
| // StateWriter implementation.
|
| - virtual void WriteState(const std::string& state) override;
|
| + void WriteState(const std::string& state) override;
|
|
|
| // SyncNetworkChannel::Observer implementation.
|
| - virtual void OnNetworkChannelStateChanged(
|
| + void OnNetworkChannelStateChanged(
|
| InvalidatorState invalidator_state) override;
|
|
|
| void DoRegistrationUpdate();
|
|
|