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

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 8771048: Add back pipelining after M17 branch point. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fix merge, match order with GRD file. Created 9 years 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 | « chrome/browser/about_flags.cc ('k') | chrome/common/chrome_switches.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 &value); 282 &value);
283 net::SpdySessionPool::set_max_sessions_per_domain(value); 283 net::SpdySessionPool::set_max_sessions_per_domain(value);
284 } 284 }
285 285
286 SetDnsCertProvenanceCheckerFactory(CreateChromeDnsCertProvenanceChecker); 286 SetDnsCertProvenanceCheckerFactory(CreateChromeDnsCertProvenanceChecker);
287 287
288 if (parsed_command_line.HasSwitch(switches::kEnableWebSocketOverSpdy)) { 288 if (parsed_command_line.HasSwitch(switches::kEnableWebSocketOverSpdy)) {
289 // Enable WebSocket over SPDY. 289 // Enable WebSocket over SPDY.
290 net::WebSocketJob::set_websocket_over_spdy_enabled(true); 290 net::WebSocketJob::set_websocket_over_spdy_enabled(true);
291 } 291 }
292
293 if (parsed_command_line.HasSwitch(switches::kEnableHttpPipelining))
294 net::HttpStreamFactory::set_http_pipelining_enabled(true);
292 } 295 }
293 296
294 void InitializeURLRequestThrottlerManager(net::NetLog* net_log) { 297 void InitializeURLRequestThrottlerManager(net::NetLog* net_log) {
295 net::URLRequestThrottlerManager::GetInstance()->set_enable_thread_checks( 298 net::URLRequestThrottlerManager::GetInstance()->set_enable_thread_checks(
296 true); 299 true);
297 300
298 // TODO(joi): Passing the NetLog here is temporary; once I switch the 301 // TODO(joi): Passing the NetLog here is temporary; once I switch the
299 // URLRequestThrottlerManager to be part of the URLRequestContext it will 302 // URLRequestThrottlerManager to be part of the URLRequestContext it will
300 // come from there. Doing it this way for now (2011/5/12) to try to fail 303 // come from there. Doing it this way for now (2011/5/12) to try to fail
301 // fast in case A/B experiment gives unexpected results. 304 // fast in case A/B experiment gives unexpected results.
(...skipping 1853 matching lines...) Expand 10 before | Expand all | Expand 10 after
2155 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && 2158 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
2156 (pre_read == "0" || pre_read == "1")) { 2159 (pre_read == "0" || pre_read == "1")) {
2157 std::string uma_name(name); 2160 std::string uma_name(name);
2158 uma_name += "_PreRead"; 2161 uma_name += "_PreRead";
2159 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 2162 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
2160 AddPreReadHistogramTime(uma_name.c_str(), time); 2163 AddPreReadHistogramTime(uma_name.c_str(), time);
2161 } 2164 }
2162 #endif 2165 #endif
2163 #endif 2166 #endif
2164 } 2167 }
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698