| Index: jingle/glue/proxy_resolving_client_socket.h
|
| diff --git a/jingle/glue/proxy_resolving_client_socket.h b/jingle/glue/proxy_resolving_client_socket.h
|
| index 58bbdba4d264e2dcfb349512fef5adc618a7d91e..27a01c3f7a219e032cfb4fc21f9bcde89a8f7ac5 100644
|
| --- a/jingle/glue/proxy_resolving_client_socket.h
|
| +++ b/jingle/glue/proxy_resolving_client_socket.h
|
| @@ -49,25 +49,25 @@ class ProxyResolvingClientSocket : public net::StreamSocket {
|
|
|
| // net::StreamSocket implementation.
|
| virtual int Read(net::IOBuffer* buf, int buf_len,
|
| - const net::CompletionCallback& callback) OVERRIDE;
|
| + const net::CompletionCallback& callback) override;
|
| virtual int Write(net::IOBuffer* buf, int buf_len,
|
| - const net::CompletionCallback& callback) OVERRIDE;
|
| - virtual int SetReceiveBufferSize(int32 size) OVERRIDE;
|
| - virtual int SetSendBufferSize(int32 size) OVERRIDE;
|
| - virtual int Connect(const net::CompletionCallback& callback) OVERRIDE;
|
| - virtual void Disconnect() OVERRIDE;
|
| - virtual bool IsConnected() const OVERRIDE;
|
| - virtual bool IsConnectedAndIdle() const OVERRIDE;
|
| - virtual int GetPeerAddress(net::IPEndPoint* address) const OVERRIDE;
|
| - virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE;
|
| - virtual const net::BoundNetLog& NetLog() const OVERRIDE;
|
| - virtual void SetSubresourceSpeculation() OVERRIDE;
|
| - virtual void SetOmniboxSpeculation() OVERRIDE;
|
| - virtual bool WasEverUsed() const OVERRIDE;
|
| - virtual bool UsingTCPFastOpen() const OVERRIDE;
|
| - virtual bool WasNpnNegotiated() const OVERRIDE;
|
| - virtual net::NextProto GetNegotiatedProtocol() const OVERRIDE;
|
| - virtual bool GetSSLInfo(net::SSLInfo* ssl_info) OVERRIDE;
|
| + const net::CompletionCallback& callback) override;
|
| + virtual int SetReceiveBufferSize(int32 size) override;
|
| + virtual int SetSendBufferSize(int32 size) override;
|
| + virtual int Connect(const net::CompletionCallback& callback) override;
|
| + virtual void Disconnect() override;
|
| + virtual bool IsConnected() const override;
|
| + virtual bool IsConnectedAndIdle() const override;
|
| + virtual int GetPeerAddress(net::IPEndPoint* address) const override;
|
| + virtual int GetLocalAddress(net::IPEndPoint* address) const override;
|
| + virtual const net::BoundNetLog& NetLog() const override;
|
| + virtual void SetSubresourceSpeculation() override;
|
| + virtual void SetOmniboxSpeculation() override;
|
| + virtual bool WasEverUsed() const override;
|
| + virtual bool UsingTCPFastOpen() const override;
|
| + virtual bool WasNpnNegotiated() const override;
|
| + virtual net::NextProto GetNegotiatedProtocol() const override;
|
| + virtual bool GetSSLInfo(net::SSLInfo* ssl_info) override;
|
|
|
| private:
|
| // Proxy resolution and connection functions.
|
|
|