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

Side by Side Diff: net/http/http_stream_factory_impl.cc

Issue 9959033: Move NextProto enum to a new file net/socket/next_proto.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address wtc's comments Created 8 years, 8 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.h ('k') | net/http/http_stream_factory_impl_job.h » ('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 #include "net/http/http_stream_factory_impl.h" 5 #include "net/http/http_stream_factory_impl.h"
6 6
7 #include "base/string_number_conversions.h" 7 #include "base/string_number_conversions.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "googleurl/src/gurl.h" 9 #include "googleurl/src/gurl.h"
10 #include "net/base/net_log.h" 10 #include "net/base/net_log.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 orphaned_job_set_.insert(job); 188 orphaned_job_set_.insert(job);
189 job->Orphan(request); 189 job->Orphan(request);
190 } 190 }
191 191
192 void HttpStreamFactoryImpl::OnSpdySessionReady( 192 void HttpStreamFactoryImpl::OnSpdySessionReady(
193 scoped_refptr<SpdySession> spdy_session, 193 scoped_refptr<SpdySession> spdy_session,
194 bool direct, 194 bool direct,
195 const SSLConfig& used_ssl_config, 195 const SSLConfig& used_ssl_config,
196 const ProxyInfo& used_proxy_info, 196 const ProxyInfo& used_proxy_info,
197 bool was_npn_negotiated, 197 bool was_npn_negotiated,
198 SSLClientSocket::NextProto protocol_negotiated, 198 NextProto protocol_negotiated,
199 bool using_spdy, 199 bool using_spdy,
200 const BoundNetLog& net_log) { 200 const BoundNetLog& net_log) {
201 const HostPortProxyPair& spdy_session_key = 201 const HostPortProxyPair& spdy_session_key =
202 spdy_session->host_port_proxy_pair(); 202 spdy_session->host_port_proxy_pair();
203 while (!spdy_session->IsClosed()) { 203 while (!spdy_session->IsClosed()) {
204 // Each iteration may empty out the RequestSet for |spdy_session_key_ in 204 // Each iteration may empty out the RequestSet for |spdy_session_key_ in
205 // |spdy_session_request_map_|. So each time, check for RequestSet and use 205 // |spdy_session_request_map_|. So each time, check for RequestSet and use
206 // the first one. 206 // the first one.
207 // 207 //
208 // TODO(willchan): If it's important, switch RequestSet out for a FIFO 208 // TODO(willchan): If it's important, switch RequestSet out for a FIFO
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 it != requests_to_fail.end(); ++it) { 263 it != requests_to_fail.end(); ++it) {
264 Request* request = *it; 264 Request* request = *it;
265 if (request == request_map_[job]) { 265 if (request == request_map_[job]) {
266 continue; 266 continue;
267 } 267 }
268 request->OnStreamFailed(NULL, status, used_ssl_config); 268 request->OnStreamFailed(NULL, status, used_ssl_config);
269 } 269 }
270 } 270 }
271 271
272 } // namespace net 272 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_stream_factory_impl.h ('k') | net/http/http_stream_factory_impl_job.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698