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

Side by Side Diff: net/socket/client_socket_pool_manager.cc

Issue 395303003: Fix a few stray net::'s in net/socket/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | « no previous file | net/socket/server_socket.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/socket/client_socket_pool_manager.h" 5 #include "net/socket/client_socket_pool_manager.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 // All connections in a group should use the same SSLConfig settings. 125 // All connections in a group should use the same SSLConfig settings.
126 // Encode version_max in the connection group's name, unless it's the 126 // Encode version_max in the connection group's name, unless it's the
127 // default version_max. (We want the common case to use the shortest 127 // default version_max. (We want the common case to use the shortest
128 // encoding). A version_max of TLS 1.1 is encoded as "ssl(max:3.2)/" 128 // encoding). A version_max of TLS 1.1 is encoded as "ssl(max:3.2)/"
129 // rather than "tlsv1.1/" because the actual protocol version, which 129 // rather than "tlsv1.1/" because the actual protocol version, which
130 // is selected by the server, may not be TLS 1.1. Do not encode 130 // is selected by the server, may not be TLS 1.1. Do not encode
131 // version_min in the connection group's name because version_min 131 // version_min in the connection group's name because version_min
132 // should be the same for all connections, whereas version_max may 132 // should be the same for all connections, whereas version_max may
133 // change for version fallbacks. 133 // change for version fallbacks.
134 std::string prefix = "ssl/"; 134 std::string prefix = "ssl/";
135 if (ssl_config_for_origin.version_max != net::kDefaultSSLVersionMax) { 135 if (ssl_config_for_origin.version_max != kDefaultSSLVersionMax) {
136 switch (ssl_config_for_origin.version_max) { 136 switch (ssl_config_for_origin.version_max) {
137 case SSL_PROTOCOL_VERSION_TLS1_2: 137 case SSL_PROTOCOL_VERSION_TLS1_2:
138 prefix = "ssl(max:3.3)/"; 138 prefix = "ssl(max:3.3)/";
139 break; 139 break;
140 case SSL_PROTOCOL_VERSION_TLS1_1: 140 case SSL_PROTOCOL_VERSION_TLS1_1:
141 prefix = "ssl(max:3.2)/"; 141 prefix = "ssl(max:3.2)/";
142 break; 142 break;
143 case SSL_PROTOCOL_VERSION_TLS1: 143 case SSL_PROTOCOL_VERSION_TLS1:
144 prefix = "ssl(max:3.1)/"; 144 prefix = "ssl(max:3.1)/";
145 break; 145 break;
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 int num_preconnect_streams) { 477 int num_preconnect_streams) {
478 return InitSocketPoolHelper( 478 return InitSocketPoolHelper(
479 request_url, request_extra_headers, request_load_flags, request_priority, 479 request_url, request_extra_headers, request_load_flags, request_priority,
480 session, proxy_info, force_spdy_over_ssl, want_spdy_over_npn, 480 session, proxy_info, force_spdy_over_ssl, want_spdy_over_npn,
481 ssl_config_for_origin, ssl_config_for_proxy, false, privacy_mode, net_log, 481 ssl_config_for_origin, ssl_config_for_proxy, false, privacy_mode, net_log,
482 num_preconnect_streams, NULL, HttpNetworkSession::NORMAL_SOCKET_POOL, 482 num_preconnect_streams, NULL, HttpNetworkSession::NORMAL_SOCKET_POOL,
483 OnHostResolutionCallback(), CompletionCallback()); 483 OnHostResolutionCallback(), CompletionCallback());
484 } 484 }
485 485
486 } // namespace net 486 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/socket/server_socket.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698