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

Side by Side Diff: net/http/http_pipelined_host_pool.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_pipelined_host_pool.h ('k') | net/http/http_pipelined_host_pool_unittest.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 #include "net/http/http_pipelined_host_pool.h" 5 #include "net/http/http_pipelined_host_pool.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "net/http/http_pipelined_host_capability.h" 10 #include "net/http/http_pipelined_host_capability.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 return capability != PIPELINE_INCAPABLE; 58 return capability != PIPELINE_INCAPABLE;
59 } 59 }
60 60
61 HttpPipelinedStream* HttpPipelinedHostPool::CreateStreamOnNewPipeline( 61 HttpPipelinedStream* HttpPipelinedHostPool::CreateStreamOnNewPipeline(
62 const HttpPipelinedHost::Key& key, 62 const HttpPipelinedHost::Key& key,
63 ClientSocketHandle* connection, 63 ClientSocketHandle* connection,
64 const SSLConfig& used_ssl_config, 64 const SSLConfig& used_ssl_config,
65 const ProxyInfo& used_proxy_info, 65 const ProxyInfo& used_proxy_info,
66 const BoundNetLog& net_log, 66 const BoundNetLog& net_log,
67 bool was_npn_negotiated, 67 bool was_npn_negotiated,
68 SSLClientSocket::NextProto protocol_negotiated) { 68 NextProto protocol_negotiated) {
69 HttpPipelinedHost* host = GetPipelinedHost(key, true); 69 HttpPipelinedHost* host = GetPipelinedHost(key, true);
70 if (!host) { 70 if (!host) {
71 return NULL; 71 return NULL;
72 } 72 }
73 return host->CreateStreamOnNewPipeline(connection, used_ssl_config, 73 return host->CreateStreamOnNewPipeline(connection, used_ssl_config,
74 used_proxy_info, net_log, 74 used_proxy_info, net_log,
75 was_npn_negotiated, 75 was_npn_negotiated,
76 protocol_negotiated); 76 protocol_negotiated);
77 } 77 }
78 78
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 ListValue* list = new ListValue(); 139 ListValue* list = new ListValue();
140 for (HostMap::const_iterator it = host_map_.begin(); 140 for (HostMap::const_iterator it = host_map_.begin();
141 it != host_map_.end(); ++it) { 141 it != host_map_.end(); ++it) {
142 Value* value = it->second->PipelineInfoToValue(); 142 Value* value = it->second->PipelineInfoToValue();
143 list->Append(value); 143 list->Append(value);
144 } 144 }
145 return list; 145 return list;
146 } 146 }
147 147
148 } // namespace net 148 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_pipelined_host_pool.h ('k') | net/http/http_pipelined_host_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698