| Index: net/socket/ssl_client_socket_nss.h
|
| diff --git a/net/socket/ssl_client_socket_nss.h b/net/socket/ssl_client_socket_nss.h
|
| index 648e24946d649a3952bd1c49f95b8d67be9ed285..f7def8c4a5a5aea7fd2063ab62cffe91fb919a76 100644
|
| --- a/net/socket/ssl_client_socket_nss.h
|
| +++ b/net/socket/ssl_client_socket_nss.h
|
| @@ -60,34 +60,39 @@ class SSLClientSocketNSS : public SSLClientSocket {
|
| static void ClearSessionCache();
|
|
|
| // SSLClientSocket methods:
|
| - virtual void GetSSLInfo(SSLInfo* ssl_info);
|
| - virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info);
|
| + virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
|
| + virtual void GetSSLCertRequestInfo(
|
| + SSLCertRequestInfo* cert_request_info) OVERRIDE;
|
| virtual int ExportKeyingMaterial(const base::StringPiece& label,
|
| const base::StringPiece& context,
|
| unsigned char *out,
|
| - unsigned int outlen);
|
| - virtual NextProtoStatus GetNextProto(std::string* proto);
|
| + unsigned int outlen) OVERRIDE;
|
| + virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE;
|
|
|
| // StreamSocket methods:
|
| - virtual int Connect(OldCompletionCallback* callback);
|
| - virtual void Disconnect();
|
| - virtual bool IsConnected() const;
|
| - virtual bool IsConnectedAndIdle() const;
|
| - virtual int GetPeerAddress(AddressList* address) const;
|
| - virtual int GetLocalAddress(IPEndPoint* address) const;
|
| - virtual const BoundNetLog& NetLog() const;
|
| - virtual void SetSubresourceSpeculation();
|
| - virtual void SetOmniboxSpeculation();
|
| - virtual bool WasEverUsed() const;
|
| - virtual bool UsingTCPFastOpen() const;
|
| - virtual int64 NumBytesRead() const;
|
| - virtual base::TimeDelta GetConnectTimeMicros() const;
|
| + virtual int Connect(OldCompletionCallback* callback) OVERRIDE;
|
| + virtual void Disconnect() OVERRIDE;
|
| + virtual bool IsConnected() const OVERRIDE;
|
| + virtual bool IsConnectedAndIdle() const OVERRIDE;
|
| + virtual int GetPeerAddress(AddressList* address) const OVERRIDE;
|
| + virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE;
|
| + virtual const BoundNetLog& NetLog() const OVERRIDE;
|
| + virtual void SetSubresourceSpeculation() OVERRIDE;
|
| + virtual void SetOmniboxSpeculation() OVERRIDE;
|
| + virtual bool WasEverUsed() const OVERRIDE;
|
| + virtual bool UsingTCPFastOpen() const OVERRIDE;
|
| + virtual int64 NumBytesRead() const OVERRIDE;
|
| + virtual base::TimeDelta GetConnectTimeMicros() const OVERRIDE;
|
|
|
| // Socket methods:
|
| - virtual int Read(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
|
| - virtual int Write(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
|
| - virtual bool SetReceiveBufferSize(int32 size);
|
| - virtual bool SetSendBufferSize(int32 size);
|
| + virtual int Read(IOBuffer* buf,
|
| + int buf_len,
|
| + OldCompletionCallback* callback) OVERRIDE;
|
| + virtual int Write(IOBuffer* buf,
|
| + int buf_len,
|
| + OldCompletionCallback* callback) OVERRIDE;
|
| + virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
|
| + virtual bool SetSendBufferSize(int32 size) OVERRIDE;
|
|
|
| private:
|
| enum State {
|
|
|