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

Unified Diff: net/http/http_stream_factory_impl_request.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, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_stream_factory_impl_job.cc ('k') | net/http/http_stream_factory_impl_request.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl_request.h
diff --git a/net/http/http_stream_factory_impl_request.h b/net/http/http_stream_factory_impl_request.h
index 468ebd31014cc6c4e0b652827ebb9376b6d61efb..e7eadbe9e8701f2f6da4ba99032097a5bce1953a 100644
--- a/net/http/http_stream_factory_impl_request.h
+++ b/net/http/http_stream_factory_impl_request.h
@@ -7,6 +7,7 @@
#include "base/scoped_ptr.h"
#include "googleurl/src/gurl.h"
+#include "net/base/net_log.h"
#include "net/http/http_stream_factory_impl.h"
namespace net {
@@ -15,7 +16,8 @@ class HttpStreamFactoryImpl::Request : public HttpStreamRequest {
public:
Request(const GURL& url,
HttpStreamFactoryImpl* factory,
- HttpStreamRequest::Delegate* delegate);
+ HttpStreamRequest::Delegate* delegate,
+ const BoundNetLog& net_log);
virtual ~Request();
// Returns the Job that the Request started up.
@@ -34,9 +36,12 @@ class HttpStreamFactoryImpl::Request : public HttpStreamRequest {
void BindJob(HttpStreamFactoryImpl::Job* job);
// Marks completion of the request. Must be called before OnStreamReady().
+ // |source| is the NetLog::Source generated by the Job that fulfilled this
+ // request.
void Complete(bool was_alternate_protocol_available,
bool was_npn_negotiated,
- bool using_spdy);
+ bool using_spdy,
+ const NetLog::Source& source);
// If this Request has a spdy_session_key, remove this session from the
// SpdySessionRequestMap.
@@ -77,6 +82,7 @@ class HttpStreamFactoryImpl::Request : public HttpStreamRequest {
const GURL url_;
HttpStreamFactoryImpl* const factory_;
HttpStreamRequest::Delegate* const delegate_;
+ const BoundNetLog net_log_;
// The |job_| that this request is tied to.
HttpStreamFactoryImpl::Job* job_;
@@ -91,4 +97,5 @@ class HttpStreamFactoryImpl::Request : public HttpStreamRequest {
};
} // namespace net
+
#endif // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_H_
« no previous file with comments | « net/http/http_stream_factory_impl_job.cc ('k') | net/http/http_stream_factory_impl_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698