diff options
| -rw-r--r-- | net/socket/ssl_client_socket_openssl.h | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/net/socket/ssl_client_socket_openssl.h b/net/socket/ssl_client_socket_openssl.h index f2739d4..a417415 100644 --- a/net/socket/ssl_client_socket_openssl.h +++ b/net/socket/ssl_client_socket_openssl.h @@ -8,6 +8,7 @@ #include <string> +#include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "net/base/cert_verify_result.h" #include "net/base/completion_callback.h" @@ -26,7 +27,6 @@ namespace net { class CertVerifier; class SingleRequestCertVerifier; class SSLCertRequestInfo; -class SSLConfig; class SSLInfo; // An SSL client socket implemented with OpenSSL. @@ -40,7 +40,7 @@ class SSLClientSocketOpenSSL : public SSLClientSocket { const HostPortPair& host_and_port, const SSLConfig& ssl_config, const SSLClientSocketContext& context); - ~SSLClientSocketOpenSSL(); + virtual ~SSLClientSocketOpenSSL(); const HostPortPair& host_and_port() const { return host_and_port_; } const std::string& ssl_session_cache_shard() const { @@ -56,39 +56,40 @@ class SSLClientSocketOpenSSL : public SSLClientSocket { const unsigned char* in, unsigned int inlen); // SSLClientSocket implementation. - 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, bool has_context, const base::StringPiece& context, unsigned char* out, - unsigned int outlen); + unsigned int outlen) OVERRIDE; virtual NextProtoStatus GetNextProto(std::string* proto, - std::string* server_protos); - virtual ServerBoundCertService* GetServerBoundCertService() const; + std::string* server_protos) OVERRIDE; + virtual ServerBoundCertService* GetServerBoundCertService() const; OVERRIDE; // StreamSocket implementation. - virtual int Connect(const CompletionCallback& 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(const CompletionCallback& 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 implementation. virtual int Read(IOBuffer* buf, int buf_len, - const CompletionCallback& callback); + const CompletionCallback& callback) OVERRIDE; virtual int Write(IOBuffer* buf, int buf_len, - const CompletionCallback& callback); - virtual bool SetReceiveBufferSize(int32 size); - virtual bool SetSendBufferSize(int32 size); + const CompletionCallback& callback) OVERRIDE; + virtual bool SetReceiveBufferSize(int32 size) OVERRIDE; + virtual bool SetSendBufferSize(int32 size) OVERRIDE; private: bool Init(); |