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

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

Issue 2496953002: Revert of Unify enum NextProto and enum AlternateProtocol. (Closed)
Patch Set: Created 4 years, 1 month 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.cc ('k') | net/socket/ssl_client_socket_impl.cc » ('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_IMPL_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
16 #include "base/containers/mru_cache.h" 16 #include "base/containers/mru_cache.h"
17 #include "base/memory/ref_counted.h" 17 #include "base/memory/ref_counted.h"
18 #include "base/memory/weak_ptr.h" 18 #include "base/memory/weak_ptr.h"
19 #include "build/build_config.h" 19 #include "build/build_config.h"
20 #include "net/base/completion_callback.h" 20 #include "net/base/completion_callback.h"
21 #include "net/base/io_buffer.h" 21 #include "net/base/io_buffer.h"
22 #include "net/cert/cert_verifier.h" 22 #include "net/cert/cert_verifier.h"
23 #include "net/cert/cert_verify_result.h" 23 #include "net/cert/cert_verify_result.h"
24 #include "net/cert/ct_verify_result.h" 24 #include "net/cert/ct_verify_result.h"
25 #include "net/log/net_log_with_source.h" 25 #include "net/log/net_log_with_source.h"
26 #include "net/socket/client_socket_handle.h" 26 #include "net/socket/client_socket_handle.h"
27 #include "net/socket/next_proto.h"
28 #include "net/socket/socket_bio_adapter.h" 27 #include "net/socket/socket_bio_adapter.h"
29 #include "net/socket/ssl_client_socket.h" 28 #include "net/socket/ssl_client_socket.h"
30 #include "net/ssl/channel_id_service.h" 29 #include "net/ssl/channel_id_service.h"
31 #include "net/ssl/openssl_ssl_util.h" 30 #include "net/ssl/openssl_ssl_util.h"
32 #include "net/ssl/ssl_client_cert_type.h" 31 #include "net/ssl/ssl_client_cert_type.h"
33 #include "net/ssl/ssl_config_service.h" 32 #include "net/ssl/ssl_config_service.h"
34 #include "third_party/boringssl/src/include/openssl/base.h" 33 #include "third_party/boringssl/src/include/openssl/base.h"
35 #include "third_party/boringssl/src/include/openssl/ssl.h" 34 #include "third_party/boringssl/src/include/openssl/ssl.h"
36 35
37 namespace base { 36 namespace base {
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 // True if PKP is bypassed due to a local trust anchor. 350 // True if PKP is bypassed due to a local trust anchor.
352 bool pkp_bypassed_; 351 bool pkp_bypassed_;
353 352
354 NetLogWithSource net_log_; 353 NetLogWithSource net_log_;
355 base::WeakPtrFactory<SSLClientSocketImpl> weak_factory_; 354 base::WeakPtrFactory<SSLClientSocketImpl> weak_factory_;
356 }; 355 };
357 356
358 } // namespace net 357 } // namespace net
359 358
360 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_ 359 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_IMPL_H_
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket.cc ('k') | net/socket/ssl_client_socket_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698