Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(415)

Side by Side Diff: net/socket/ssl_client_socket_nss.h

Issue 623213004: replace OVERRIDE and FINAL with override and final in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: undo unwanted change in comment Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/socket/ssl_client_socket.h ('k') | net/socket/ssl_client_socket_openssl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
7 7
8 #include <certt.h> 8 #include <certt.h>
9 #include <keyt.h> 9 #include <keyt.h>
10 #include <nspr.h> 10 #include <nspr.h>
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 // behaviour is desired, for performance or compatibility, the current task 61 // behaviour is desired, for performance or compatibility, the current task
62 // runner should be supplied instead. 62 // runner should be supplied instead.
63 SSLClientSocketNSS(base::SequencedTaskRunner* nss_task_runner, 63 SSLClientSocketNSS(base::SequencedTaskRunner* nss_task_runner,
64 scoped_ptr<ClientSocketHandle> transport_socket, 64 scoped_ptr<ClientSocketHandle> transport_socket,
65 const HostPortPair& host_and_port, 65 const HostPortPair& host_and_port,
66 const SSLConfig& ssl_config, 66 const SSLConfig& ssl_config,
67 const SSLClientSocketContext& context); 67 const SSLClientSocketContext& context);
68 virtual ~SSLClientSocketNSS(); 68 virtual ~SSLClientSocketNSS();
69 69
70 // SSLClientSocket implementation. 70 // SSLClientSocket implementation.
71 virtual std::string GetSessionCacheKey() const OVERRIDE; 71 virtual std::string GetSessionCacheKey() const override;
72 virtual bool InSessionCache() const OVERRIDE; 72 virtual bool InSessionCache() const override;
73 virtual void SetHandshakeCompletionCallback( 73 virtual void SetHandshakeCompletionCallback(
74 const base::Closure& callback) OVERRIDE; 74 const base::Closure& callback) override;
75 virtual void GetSSLCertRequestInfo( 75 virtual void GetSSLCertRequestInfo(
76 SSLCertRequestInfo* cert_request_info) OVERRIDE; 76 SSLCertRequestInfo* cert_request_info) override;
77 virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE; 77 virtual NextProtoStatus GetNextProto(std::string* proto) override;
78 78
79 // SSLSocket implementation. 79 // SSLSocket implementation.
80 virtual int ExportKeyingMaterial(const base::StringPiece& label, 80 virtual int ExportKeyingMaterial(const base::StringPiece& label,
81 bool has_context, 81 bool has_context,
82 const base::StringPiece& context, 82 const base::StringPiece& context,
83 unsigned char* out, 83 unsigned char* out,
84 unsigned int outlen) OVERRIDE; 84 unsigned int outlen) override;
85 virtual int GetTLSUniqueChannelBinding(std::string* out) OVERRIDE; 85 virtual int GetTLSUniqueChannelBinding(std::string* out) override;
86 86
87 // StreamSocket implementation. 87 // StreamSocket implementation.
88 virtual int Connect(const CompletionCallback& callback) OVERRIDE; 88 virtual int Connect(const CompletionCallback& callback) override;
89 virtual void Disconnect() OVERRIDE; 89 virtual void Disconnect() override;
90 virtual bool IsConnected() const OVERRIDE; 90 virtual bool IsConnected() const override;
91 virtual bool IsConnectedAndIdle() const OVERRIDE; 91 virtual bool IsConnectedAndIdle() const override;
92 virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; 92 virtual int GetPeerAddress(IPEndPoint* address) const override;
93 virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; 93 virtual int GetLocalAddress(IPEndPoint* address) const override;
94 virtual const BoundNetLog& NetLog() const OVERRIDE; 94 virtual const BoundNetLog& NetLog() const override;
95 virtual void SetSubresourceSpeculation() OVERRIDE; 95 virtual void SetSubresourceSpeculation() override;
96 virtual void SetOmniboxSpeculation() OVERRIDE; 96 virtual void SetOmniboxSpeculation() override;
97 virtual bool WasEverUsed() const OVERRIDE; 97 virtual bool WasEverUsed() const override;
98 virtual bool UsingTCPFastOpen() const OVERRIDE; 98 virtual bool UsingTCPFastOpen() const override;
99 virtual bool GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; 99 virtual bool GetSSLInfo(SSLInfo* ssl_info) override;
100 100
101 // Socket implementation. 101 // Socket implementation.
102 virtual int Read(IOBuffer* buf, 102 virtual int Read(IOBuffer* buf,
103 int buf_len, 103 int buf_len,
104 const CompletionCallback& callback) OVERRIDE; 104 const CompletionCallback& callback) override;
105 virtual int Write(IOBuffer* buf, 105 virtual int Write(IOBuffer* buf,
106 int buf_len, 106 int buf_len,
107 const CompletionCallback& callback) OVERRIDE; 107 const CompletionCallback& callback) override;
108 virtual int SetReceiveBufferSize(int32 size) OVERRIDE; 108 virtual int SetReceiveBufferSize(int32 size) override;
109 virtual int SetSendBufferSize(int32 size) OVERRIDE; 109 virtual int SetSendBufferSize(int32 size) override;
110 virtual ChannelIDService* GetChannelIDService() const OVERRIDE; 110 virtual ChannelIDService* GetChannelIDService() const override;
111 111
112 protected: 112 protected:
113 // SSLClientSocket implementation. 113 // SSLClientSocket implementation.
114 virtual scoped_refptr<X509Certificate> GetUnverifiedServerCertificateChain() 114 virtual scoped_refptr<X509Certificate> GetUnverifiedServerCertificateChain()
115 const OVERRIDE; 115 const override;
116 116
117 private: 117 private:
118 // Helper class to handle marshalling any NSS interaction to and from the 118 // Helper class to handle marshalling any NSS interaction to and from the
119 // NSS and network task runners. Not every call needs to happen on the Core 119 // NSS and network task runners. Not every call needs to happen on the Core
120 class Core; 120 class Core;
121 121
122 enum State { 122 enum State {
123 STATE_NONE, 123 STATE_NONE,
124 STATE_HANDSHAKE, 124 STATE_HANDSHAKE,
125 STATE_HANDSHAKE_COMPLETE, 125 STATE_HANDSHAKE_COMPLETE,
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 // Added the following code Debugging in release mode. 214 // Added the following code Debugging in release mode.
215 mutable base::Lock lock_; 215 mutable base::Lock lock_;
216 // This is mutable so that CalledOnValidThread can set it. 216 // This is mutable so that CalledOnValidThread can set it.
217 // It's guarded by |lock_|. 217 // It's guarded by |lock_|.
218 mutable base::PlatformThreadId valid_thread_id_; 218 mutable base::PlatformThreadId valid_thread_id_;
219 }; 219 };
220 220
221 } // namespace net 221 } // namespace net
222 222
223 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 223 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket.h ('k') | net/socket/ssl_client_socket_openssl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698