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

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

Issue 284423002: Remove HttpStreamFactory's NPN/SPDY globals, except for spdy_enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge Created 6 years, 7 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
« no previous file with comments | « net/http/http_stream_factory_impl.cc ('k') | net/http/http_stream_factory_impl_job.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_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/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 // True if this network transaction is using SPDY instead of HTTP. 289 // True if this network transaction is using SPDY instead of HTTP.
290 bool using_spdy_; 290 bool using_spdy_;
291 291
292 // True if this network transaction is using QUIC instead of HTTP. 292 // True if this network transaction is using QUIC instead of HTTP.
293 bool using_quic_; 293 bool using_quic_;
294 QuicStreamRequest quic_request_; 294 QuicStreamRequest quic_request_;
295 295
296 // True if this job used an existing QUIC session. 296 // True if this job used an existing QUIC session.
297 bool using_existing_quic_session_; 297 bool using_existing_quic_session_;
298 298
299 // Force spdy for all connections.
300 bool force_spdy_always_;
301
302 // Force spdy only for SSL connections.
303 bool force_spdy_over_ssl_;
304
305 // Force quic for a specific port. 299 // Force quic for a specific port.
306 int force_quic_port_; 300 int force_quic_port_;
307 301
308 // The certificate error while using SPDY over SSL for insecure URLs. 302 // The certificate error while using SPDY over SSL for insecure URLs.
309 int spdy_certificate_error_; 303 int spdy_certificate_error_;
310 304
311 scoped_refptr<HttpAuthController> 305 scoped_refptr<HttpAuthController>
312 auth_controllers_[HttpAuth::AUTH_NUM_TARGETS]; 306 auth_controllers_[HttpAuth::AUTH_NUM_TARGETS];
313 307
314 // True when the tunnel is in the process of being established - we can't 308 // True when the tunnel is in the process of being established - we can't
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 JobStatus other_job_status_; 341 JobStatus other_job_status_;
348 342
349 base::WeakPtrFactory<Job> ptr_factory_; 343 base::WeakPtrFactory<Job> ptr_factory_;
350 344
351 DISALLOW_COPY_AND_ASSIGN(Job); 345 DISALLOW_COPY_AND_ASSIGN(Job);
352 }; 346 };
353 347
354 } // namespace net 348 } // namespace net
355 349
356 #endif // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_ 350 #endif // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_
OLDNEW
« no previous file with comments | « net/http/http_stream_factory_impl.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698