| Index: chrome/browser/invalidation/gcm_invalidation_bridge.h
|
| diff --git a/chrome/browser/invalidation/gcm_invalidation_bridge.h b/chrome/browser/invalidation/gcm_invalidation_bridge.h
|
| index a9d781e478b3dbc5e8919e8ddf5a1a8593a138f9..82cd5b029620896022241ce3d401185ad5dc6456 100644
|
| --- a/chrome/browser/invalidation/gcm_invalidation_bridge.h
|
| +++ b/chrome/browser/invalidation/gcm_invalidation_bridge.h
|
| @@ -51,12 +51,12 @@ class GCMInvalidationBridge : public gcm::GCMAppHandler,
|
| // gcm::GCMEventRouter implementation.
|
| virtual void ShutdownHandler() OVERRIDE;
|
| virtual void OnMessage(const std::string& app_id,
|
| - const gcm::GCMClient::IncomingMessage& message)
|
| + const gcm::IncomingMessage& message)
|
| OVERRIDE;
|
| virtual void OnMessagesDeleted(const std::string& app_id) OVERRIDE;
|
| virtual void OnSendError(
|
| const std::string& app_id,
|
| - const gcm::GCMClient::SendErrorDetails& send_error_details) OVERRIDE;
|
| + const gcm::SendErrorDetails& send_error_details) OVERRIDE;
|
|
|
| scoped_ptr<syncer::GCMNetworkChannelDelegate> CreateDelegate();
|
|
|
| @@ -77,7 +77,7 @@ class GCMInvalidationBridge : public gcm::GCMAppHandler,
|
| void RegisterFinished(
|
| syncer::GCMNetworkChannelDelegate::RegisterCallback callback,
|
| const std::string& registration_id,
|
| - gcm::GCMClient::Result result);
|
| + gcm::Result result);
|
|
|
| private:
|
| gcm::GCMService* const gcm_service_;
|
|
|