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

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

Issue 1550843002: Convert enable_bidirectional_stream into build flag local to net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove #include net_features.h from public headers. Created 4 years, 11 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
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_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_ 5 #ifndef NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_
6 #define NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_ 6 #define NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/time/time.h" 12 #include "base/time/time.h"
13 #include "net/base/completion_callback.h" 13 #include "net/base/completion_callback.h"
14 #include "net/base/request_priority.h" 14 #include "net/base/request_priority.h"
15 #include "net/http/http_auth.h" 15 #include "net/http/http_auth.h"
16 #include "net/http/http_auth_controller.h" 16 #include "net/http/http_auth_controller.h"
17 #include "net/http/http_request_info.h" 17 #include "net/http/http_request_info.h"
18 #include "net/http/http_stream_factory_impl.h" 18 #include "net/http/http_stream_factory_impl.h"
19 #include "net/log/net_log.h" 19 #include "net/log/net_log.h"
20 #include "net/net_features.h"
20 #include "net/proxy/proxy_service.h" 21 #include "net/proxy/proxy_service.h"
21 #include "net/quic/quic_stream_factory.h" 22 #include "net/quic/quic_stream_factory.h"
22 #include "net/socket/client_socket_handle.h" 23 #include "net/socket/client_socket_handle.h"
23 #include "net/socket/client_socket_pool_manager.h" 24 #include "net/socket/client_socket_pool_manager.h"
24 #include "net/socket/ssl_client_socket.h" 25 #include "net/socket/ssl_client_socket.h"
25 #include "net/spdy/spdy_session_key.h" 26 #include "net/spdy/spdy_session_key.h"
26 #include "net/ssl/ssl_config_service.h" 27 #include "net/ssl/ssl_config_service.h"
27 28
28 namespace net { 29 namespace net {
29 30
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 369
369 scoped_refptr<HttpAuthController> 370 scoped_refptr<HttpAuthController>
370 auth_controllers_[HttpAuth::AUTH_NUM_TARGETS]; 371 auth_controllers_[HttpAuth::AUTH_NUM_TARGETS];
371 372
372 // True when the tunnel is in the process of being established - we can't 373 // True when the tunnel is in the process of being established - we can't
373 // read from the socket until the tunnel is done. 374 // read from the socket until the tunnel is done.
374 bool establishing_tunnel_; 375 bool establishing_tunnel_;
375 376
376 scoped_ptr<HttpStream> stream_; 377 scoped_ptr<HttpStream> stream_;
377 scoped_ptr<WebSocketHandshakeStreamBase> websocket_stream_; 378 scoped_ptr<WebSocketHandshakeStreamBase> websocket_stream_;
378 #if defined(ENABLE_BIDIRECTIONAL_STREAM) 379 #if BUILDFLAG(ENABLE_BIDIRECTIONAL_STREAM)
379 scoped_ptr<BidirectionalStreamJob> bidirectional_stream_job_; 380 scoped_ptr<BidirectionalStreamJob> bidirectional_stream_job_;
380 #endif 381 #endif
381 382
382 // True if we negotiated NPN. 383 // True if we negotiated NPN.
383 bool was_npn_negotiated_; 384 bool was_npn_negotiated_;
384 385
385 // Protocol negotiated with the server. 386 // Protocol negotiated with the server.
386 NextProto protocol_negotiated_; 387 NextProto protocol_negotiated_;
387 388
388 // 0 if we're not preconnecting. Otherwise, the number of streams to 389 // 0 if we're not preconnecting. Otherwise, the number of streams to
(...skipping 18 matching lines...) Expand all
407 bool for_bidirectional_; 408 bool for_bidirectional_;
408 409
409 base::WeakPtrFactory<Job> ptr_factory_; 410 base::WeakPtrFactory<Job> ptr_factory_;
410 411
411 DISALLOW_COPY_AND_ASSIGN(Job); 412 DISALLOW_COPY_AND_ASSIGN(Job);
412 }; 413 };
413 414
414 } // namespace net 415 } // namespace net
415 416
416 #endif // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_ 417 #endif // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698