| Index: google_apis/gcm/engine/connection_factory_impl.h
|
| diff --git a/google_apis/gcm/engine/connection_factory_impl.h b/google_apis/gcm/engine/connection_factory_impl.h
|
| index ddd81737f81741b81c02456e8f183bc484106089..21eeedbe0094600f2a2c7607c70a2e49bbeef544 100644
|
| --- a/google_apis/gcm/engine/connection_factory_impl.h
|
| +++ b/google_apis/gcm/engine/connection_factory_impl.h
|
| @@ -48,18 +48,18 @@ class GCM_EXPORT ConnectionFactoryImpl :
|
| virtual void Initialize(
|
| const BuildLoginRequestCallback& request_builder,
|
| const ConnectionHandler::ProtoReceivedCallback& read_callback,
|
| - const ConnectionHandler::ProtoSentCallback& write_callback) OVERRIDE;
|
| - virtual ConnectionHandler* GetConnectionHandler() const OVERRIDE;
|
| - virtual void Connect() OVERRIDE;
|
| - virtual bool IsEndpointReachable() const OVERRIDE;
|
| - virtual std::string GetConnectionStateString() const OVERRIDE;
|
| - virtual base::TimeTicks NextRetryAttempt() const OVERRIDE;
|
| - virtual void SignalConnectionReset(ConnectionResetReason reason) OVERRIDE;
|
| - virtual void SetConnectionListener(ConnectionListener* listener) OVERRIDE;
|
| + const ConnectionHandler::ProtoSentCallback& write_callback) override;
|
| + virtual ConnectionHandler* GetConnectionHandler() const override;
|
| + virtual void Connect() override;
|
| + virtual bool IsEndpointReachable() const override;
|
| + virtual std::string GetConnectionStateString() const override;
|
| + virtual base::TimeTicks NextRetryAttempt() const override;
|
| + virtual void SignalConnectionReset(ConnectionResetReason reason) override;
|
| + virtual void SetConnectionListener(ConnectionListener* listener) override;
|
|
|
| // NetworkChangeObserver implementation.
|
| virtual void OnNetworkChanged(
|
| - net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
|
| + net::NetworkChangeNotifier::ConnectionType type) override;
|
|
|
| // Returns the server to which the factory is currently connected, or if
|
| // a connection is currently pending, the server to which the next connection
|
|
|