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

Side by Side Diff: net/spdy/spdy_http_stream.cc

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 2 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 #include "net/spdy/spdy_http_stream.h" 5 #include "net/spdy/spdy_http_stream.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <list> 8 #include <list>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 57
58 SpdyHttpStream::~SpdyHttpStream() { 58 SpdyHttpStream::~SpdyHttpStream() {
59 if (stream_.get()) { 59 if (stream_.get()) {
60 stream_->DetachDelegate(); 60 stream_->DetachDelegate();
61 DCHECK(!stream_.get()); 61 DCHECK(!stream_.get());
62 } 62 }
63 } 63 }
64 64
65 int SpdyHttpStream::InitializeStream(const HttpRequestInfo* request_info, 65 int SpdyHttpStream::InitializeStream(const HttpRequestInfo* request_info,
66 RequestPriority priority, 66 RequestPriority priority,
67 const BoundNetLog& stream_net_log, 67 const NetLogWithSource& stream_net_log,
68 const CompletionCallback& callback) { 68 const CompletionCallback& callback) {
69 DCHECK(!stream_); 69 DCHECK(!stream_);
70 if (!spdy_session_) 70 if (!spdy_session_)
71 return ERR_CONNECTION_CLOSED; 71 return ERR_CONNECTION_CLOSED;
72 72
73 request_info_ = request_info; 73 request_info_ = request_info;
74 if (request_info_->method == "GET") { 74 if (request_info_->method == "GET") {
75 int error = spdy_session_->GetPushStream(request_info_->url, &stream_, 75 int error = spdy_session_->GetPushStream(request_info_->url, &stream_,
76 stream_net_log); 76 stream_net_log);
77 if (error != OK) 77 if (error != OK)
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 details->connection_info = HttpResponseInfo::CONNECTION_INFO_HTTP2; 607 details->connection_info = HttpResponseInfo::CONNECTION_INFO_HTTP2;
608 return; 608 return;
609 } 609 }
610 610
611 void SpdyHttpStream::SetPriority(RequestPriority priority) { 611 void SpdyHttpStream::SetPriority(RequestPriority priority) {
612 // TODO(akalin): Plumb this through to |stream_request_| and 612 // TODO(akalin): Plumb this through to |stream_request_| and
613 // |stream_|. 613 // |stream_|.
614 } 614 }
615 615
616 } // namespace net 616 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698