| Index: components/invalidation/invalidation_service_android.h
|
| diff --git a/components/invalidation/invalidation_service_android.h b/components/invalidation/invalidation_service_android.h
|
| index 4a9e77aa749a63382233078029f62293db7ec39b..c8e0a5125d6dbdfa5d76e902e91fd2ef7190d0be 100644
|
| --- a/components/invalidation/invalidation_service_android.h
|
| +++ b/components/invalidation/invalidation_service_android.h
|
| @@ -30,27 +30,25 @@ class InvalidationServiceAndroid
|
| public InvalidationService {
|
| public:
|
| InvalidationServiceAndroid(jobject context);
|
| - virtual ~InvalidationServiceAndroid();
|
| + ~InvalidationServiceAndroid() override;
|
|
|
| // InvalidationService implementation.
|
| //
|
| // Note that this implementation does not properly support Ack-tracking,
|
| // fetching the invalidator state, or querying the client's ID. Support for
|
| // exposing the client ID should be available soon; see crbug.com/172391.
|
| - virtual void RegisterInvalidationHandler(
|
| + void RegisterInvalidationHandler(
|
| syncer::InvalidationHandler* handler) override;
|
| - virtual void UpdateRegisteredInvalidationIds(
|
| - syncer::InvalidationHandler* handler,
|
| - const syncer::ObjectIdSet& ids) override;
|
| - virtual void UnregisterInvalidationHandler(
|
| + void UpdateRegisteredInvalidationIds(syncer::InvalidationHandler* handler,
|
| + const syncer::ObjectIdSet& ids) override;
|
| + void UnregisterInvalidationHandler(
|
| syncer::InvalidationHandler* handler) override;
|
| - virtual syncer::InvalidatorState GetInvalidatorState() const override;
|
| - virtual std::string GetInvalidatorClientId() const override;
|
| - virtual InvalidationLogger* GetInvalidationLogger() override;
|
| - virtual void RequestDetailedStatus(
|
| - base::Callback<void(const base::DictionaryValue&)> caller) const
|
| - override;
|
| - virtual IdentityProvider* GetIdentityProvider() override;
|
| + syncer::InvalidatorState GetInvalidatorState() const override;
|
| + std::string GetInvalidatorClientId() const override;
|
| + InvalidationLogger* GetInvalidationLogger() override;
|
| + void RequestDetailedStatus(
|
| + base::Callback<void(const base::DictionaryValue&)> caller) const override;
|
| + IdentityProvider* GetIdentityProvider() override;
|
|
|
| void RequestSync(JNIEnv* env,
|
| jobject obj,
|
|
|