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

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

Issue 9959033: Move NextProto enum to a new file net/socket/next_proto.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Unwrap short lines. Created 8 years, 8 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 | Annotate | Revision Log
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 #pragma once 7 #pragma once
8 8
9 #include <certt.h> 9 #include <certt.h>
10 #include <keyt.h> 10 #include <keyt.h>
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 59
60 // SSLClientSocket implementation. 60 // SSLClientSocket implementation.
61 virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; 61 virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
62 virtual void GetSSLCertRequestInfo( 62 virtual void GetSSLCertRequestInfo(
63 SSLCertRequestInfo* cert_request_info) OVERRIDE; 63 SSLCertRequestInfo* cert_request_info) OVERRIDE;
64 virtual int ExportKeyingMaterial(const base::StringPiece& label, 64 virtual int ExportKeyingMaterial(const base::StringPiece& label,
65 bool has_context, 65 bool has_context,
66 const base::StringPiece& context, 66 const base::StringPiece& context,
67 unsigned char* out, 67 unsigned char* out,
68 unsigned int outlen) OVERRIDE; 68 unsigned int outlen) OVERRIDE;
69 virtual NextProtoStatus GetNextProto(std::string* proto, 69 virtual SSLClientSocket::NextProtoStatus GetNextProto(std::string* proto,
70 std::string* server_protos) OVERRIDE; 70 std::string* server_protos) OVERRIDE;
71 71
72 // StreamSocket implementation. 72 // StreamSocket implementation.
73 virtual int Connect(const CompletionCallback& callback) OVERRIDE; 73 virtual int Connect(const CompletionCallback& callback) OVERRIDE;
74 virtual void Disconnect() OVERRIDE; 74 virtual void Disconnect() OVERRIDE;
75 virtual bool IsConnected() const OVERRIDE; 75 virtual bool IsConnected() const OVERRIDE;
76 virtual bool IsConnectedAndIdle() const OVERRIDE; 76 virtual bool IsConnectedAndIdle() const OVERRIDE;
77 virtual int GetPeerAddress(AddressList* address) const OVERRIDE; 77 virtual int GetPeerAddress(AddressList* address) const OVERRIDE;
78 virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; 78 virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE;
79 virtual const BoundNetLog& NetLog() const OVERRIDE; 79 virtual const BoundNetLog& NetLog() const OVERRIDE;
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 BoundNetLog net_log_; 294 BoundNetLog net_log_;
295 295
296 base::TimeTicks start_cert_verification_time_; 296 base::TimeTicks start_cert_verification_time_;
297 297
298 scoped_ptr<SSLHostInfo> ssl_host_info_; 298 scoped_ptr<SSLHostInfo> ssl_host_info_;
299 299
300 TransportSecurityState* transport_security_state_; 300 TransportSecurityState* transport_security_state_;
301 301
302 // next_proto_ is the protocol that we selected by NPN. 302 // next_proto_ is the protocol that we selected by NPN.
303 std::string next_proto_; 303 std::string next_proto_;
304 NextProtoStatus next_proto_status_; 304 SSLClientSocket::NextProtoStatus next_proto_status_;
305 // Server's NPN advertised protocols. 305 // Server's NPN advertised protocols.
306 std::string server_protos_; 306 std::string server_protos_;
307 307
308 // The following two variables are added for debugging bug 65948. Will 308 // The following two variables are added for debugging bug 65948. Will
309 // remove this code after fixing bug 65948. 309 // remove this code after fixing bug 65948.
310 // Added the following code Debugging in release mode. 310 // Added the following code Debugging in release mode.
311 mutable base::Lock lock_; 311 mutable base::Lock lock_;
312 // This is mutable so that CalledOnValidThread can set it. 312 // This is mutable so that CalledOnValidThread can set it.
313 // It's guarded by |lock_|. 313 // It's guarded by |lock_|.
314 mutable base::PlatformThreadId valid_thread_id_; 314 mutable base::PlatformThreadId valid_thread_id_;
315 }; 315 };
316 316
317 } // namespace net 317 } // namespace net
318 318
319 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 319 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698