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

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

Issue 6592027: Update NetLog in preparation for late binding of HttpStream jobs to requests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address nits. Created 9 years, 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/ref_counted.h" 8 #include "base/ref_counted.h"
9 #include "base/scoped_ptr.h" 9 #include "base/scoped_ptr.h"
10 #include "base/task.h" 10 #include "base/task.h"
11 #include "net/base/completion_callback.h" 11 #include "net/base/completion_callback.h"
12 #include "net/base/net_log.h"
12 #include "net/base/ssl_config_service.h" 13 #include "net/base/ssl_config_service.h"
13 #include "net/http/http_alternate_protocols.h" 14 #include "net/http/http_alternate_protocols.h"
14 #include "net/http/http_auth.h" 15 #include "net/http/http_auth.h"
15 #include "net/http/http_auth_controller.h" 16 #include "net/http/http_auth_controller.h"
16 #include "net/http/http_request_info.h" 17 #include "net/http/http_request_info.h"
17 #include "net/http/http_stream_factory_impl.h" 18 #include "net/http/http_stream_factory_impl.h"
18 #include "net/proxy/proxy_service.h" 19 #include "net/proxy/proxy_service.h"
19 #include "net/socket/client_socket_handle.h" 20 #include "net/socket/client_socket_handle.h"
20 21
21 namespace net { 22 namespace net {
(...skipping 30 matching lines...) Expand all
52 const SSLConfig& ssl_config, 53 const SSLConfig& ssl_config,
53 const BoundNetLog& net_log); 54 const BoundNetLog& net_log);
54 55
55 int RestartTunnelWithProxyAuth(const string16& username, 56 int RestartTunnelWithProxyAuth(const string16& username,
56 const string16& password); 57 const string16& password);
57 LoadState GetLoadState() const; 58 LoadState GetLoadState() const;
58 59
59 bool was_alternate_protocol_available() const; 60 bool was_alternate_protocol_available() const;
60 bool was_npn_negotiated() const; 61 bool was_npn_negotiated() const;
61 bool using_spdy() const; 62 bool using_spdy() const;
63 const BoundNetLog& net_log() const { return net_log_; }
62 64
63 const SSLConfig& ssl_config() const; 65 const SSLConfig& ssl_config() const;
64 const ProxyInfo& proxy_info() const; 66 const ProxyInfo& proxy_info() const;
65 67
66 // Indicates whether or not this job is performing a preconnect. 68 // Indicates whether or not this job is performing a preconnect.
67 bool IsPreconnecting() const; 69 bool IsPreconnecting() const;
68 70
69 private: 71 private:
70 enum AlternateProtocolMode { 72 enum AlternateProtocolMode {
71 kUnspecified, // Unspecified, check HttpAlternateProtocols 73 kUnspecified, // Unspecified, check HttpAlternateProtocols
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 bool spdy_session_direct_; 242 bool spdy_session_direct_;
241 243
242 ScopedRunnableMethodFactory<Job> method_factory_; 244 ScopedRunnableMethodFactory<Job> method_factory_;
243 245
244 DISALLOW_COPY_AND_ASSIGN(Job); 246 DISALLOW_COPY_AND_ASSIGN(Job);
245 }; 247 };
246 248
247 } // namespace net 249 } // namespace net
248 250
249 #endif // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_ 251 #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