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

Side by Side Diff: net/socket_stream/socket_stream.h

Issue 16501002: Give more request types a TransportSecurityState. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolve merge conflict after rebase. Created 7 years, 6 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_STREAM_SOCKET_STREAM_H_ 5 #ifndef NET_SOCKET_STREAM_SOCKET_STREAM_H_
6 #define NET_SOCKET_STREAM_SOCKET_STREAM_H_ 6 #define NET_SOCKET_STREAM_SOCKET_STREAM_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 18 matching lines...) Expand all
29 class CertVerifier; 29 class CertVerifier;
30 class ClientSocketFactory; 30 class ClientSocketFactory;
31 class CookieOptions; 31 class CookieOptions;
32 class HostResolver; 32 class HostResolver;
33 class HttpAuthController; 33 class HttpAuthController;
34 class SSLInfo; 34 class SSLInfo;
35 class ServerBoundCertService; 35 class ServerBoundCertService;
36 class SingleRequestHostResolver; 36 class SingleRequestHostResolver;
37 class StreamSocket; 37 class StreamSocket;
38 class SocketStreamMetrics; 38 class SocketStreamMetrics;
39 class TransportSecurityState;
39 class URLRequestContext; 40 class URLRequestContext;
40 41
41 // SocketStream is used to implement Web Sockets. 42 // SocketStream is used to implement Web Sockets.
42 // It provides plain full-duplex stream with proxy and SSL support. 43 // It provides plain full-duplex stream with proxy and SSL support.
43 // For proxy authentication, only basic mechanisum is supported. It will try 44 // For proxy authentication, only basic mechanisum is supported. It will try
44 // authentication identity for proxy URL first. If server requires proxy 45 // authentication identity for proxy URL first. If server requires proxy
45 // authentication, it will try authentication identity for realm that server 46 // authentication, it will try authentication identity for realm that server
46 // requests. 47 // requests.
47 class NET_EXPORT SocketStream 48 class NET_EXPORT SocketStream
48 : public base::RefCountedThreadSafe<SocketStream> { 49 : public base::RefCountedThreadSafe<SocketStream> {
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 bool server_closed_; 389 bool server_closed_;
389 390
390 scoped_ptr<SocketStreamMetrics> metrics_; 391 scoped_ptr<SocketStreamMetrics> metrics_;
391 392
392 DISALLOW_COPY_AND_ASSIGN(SocketStream); 393 DISALLOW_COPY_AND_ASSIGN(SocketStream);
393 }; 394 };
394 395
395 } // namespace net 396 } // namespace net
396 397
397 #endif // NET_SOCKET_STREAM_SOCKET_STREAM_H_ 398 #endif // NET_SOCKET_STREAM_SOCKET_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698