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

Side by Side Diff: net/http/http_network_transaction.h

Issue 119346: Introduce HttpStream and HttpBasicStream. (Closed)
Patch Set: Add comments to HttpBasicStream. Switch declaration order of Read/Write. Created 11 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
« no previous file with comments | « net/http/http_basic_stream.h ('k') | net/http/http_network_transaction.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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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_HTTP_HTTP_NETWORK_TRANSACTION_H_ 5 #ifndef NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
6 #define NET_HTTP_HTTP_NETWORK_TRANSACTION_H_ 6 #define NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/ref_counted.h" 10 #include "base/ref_counted.h"
(...skipping 12 matching lines...) Expand all
23 #include "net/http/http_response_info.h" 23 #include "net/http/http_response_info.h"
24 #include "net/http/http_transaction.h" 24 #include "net/http/http_transaction.h"
25 #include "net/proxy/proxy_service.h" 25 #include "net/proxy/proxy_service.h"
26 #include "testing/gtest/include/gtest/gtest_prod.h" 26 #include "testing/gtest/include/gtest/gtest_prod.h"
27 27
28 namespace net { 28 namespace net {
29 29
30 class ClientSocketFactory; 30 class ClientSocketFactory;
31 class HttpChunkedDecoder; 31 class HttpChunkedDecoder;
32 class HttpNetworkSession; 32 class HttpNetworkSession;
33 class HttpStream;
33 class UploadDataStream; 34 class UploadDataStream;
34 35
35 class HttpNetworkTransaction : public HttpTransaction { 36 class HttpNetworkTransaction : public HttpTransaction {
36 public: 37 public:
37 HttpNetworkTransaction(HttpNetworkSession* session, 38 HttpNetworkTransaction(HttpNetworkSession* session,
38 ClientSocketFactory* socket_factory); 39 ClientSocketFactory* socket_factory);
39 40
40 virtual ~HttpNetworkTransaction(); 41 virtual ~HttpNetworkTransaction();
41 42
42 // HttpTransaction methods: 43 // HttpTransaction methods:
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 HttpResponseInfo response_; 290 HttpResponseInfo response_;
290 291
291 ProxyService::PacRequest* pac_request_; 292 ProxyService::PacRequest* pac_request_;
292 ProxyInfo proxy_info_; 293 ProxyInfo proxy_info_;
293 294
294 HostResolver resolver_; 295 HostResolver resolver_;
295 AddressList addresses_; 296 AddressList addresses_;
296 297
297 ClientSocketFactory* socket_factory_; 298 ClientSocketFactory* socket_factory_;
298 ClientSocketHandle connection_; 299 ClientSocketHandle connection_;
300 scoped_ptr<HttpStream> http_stream_;
299 bool reused_socket_; 301 bool reused_socket_;
300 302
301 bool using_ssl_; // True if handling a HTTPS request 303 bool using_ssl_; // True if handling a HTTPS request
302 bool using_proxy_; // True if using a proxy for HTTP (not HTTPS) 304 bool using_proxy_; // True if using a proxy for HTTP (not HTTPS)
303 bool using_tunnel_; // True if using a tunnel for HTTPS 305 bool using_tunnel_; // True if using a tunnel for HTTPS
304 306
305 // True while establishing a tunnel. This allows the HTTP CONNECT 307 // True while establishing a tunnel. This allows the HTTP CONNECT
306 // request/response to reuse the STATE_WRITE_HEADERS, 308 // request/response to reuse the STATE_WRITE_HEADERS,
307 // STATE_WRITE_HEADERS_COMPLETE, STATE_READ_HEADERS, and 309 // STATE_WRITE_HEADERS_COMPLETE, STATE_READ_HEADERS, and
308 // STATE_READ_HEADERS_COMPLETE states and allows us to tell them apart from 310 // STATE_READ_HEADERS_COMPLETE states and allows us to tell them apart from
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 // The time the host resolution started (if it indeed got started). 384 // The time the host resolution started (if it indeed got started).
383 base::Time host_resolution_start_time_; 385 base::Time host_resolution_start_time_;
384 386
385 // The next state in the state machine. 387 // The next state in the state machine.
386 State next_state_; 388 State next_state_;
387 }; 389 };
388 390
389 } // namespace net 391 } // namespace net
390 392
391 #endif // NET_HTTP_HTTP_NETWORK_TRANSACTION_H_ 393 #endif // NET_HTTP_HTTP_NETWORK_TRANSACTION_H_
OLDNEW
« no previous file with comments | « net/http/http_basic_stream.h ('k') | net/http/http_network_transaction.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698