| OLD | NEW |
| 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/browser_main.h" | 5 #include "chrome/browser/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 758 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 769 &value); | 769 &value); |
| 770 net::SpdySessionPool::set_max_sessions_per_domain(value); | 770 net::SpdySessionPool::set_max_sessions_per_domain(value); |
| 771 } | 771 } |
| 772 | 772 |
| 773 SetDnsCertProvenanceCheckerFactory(CreateChromeDnsCertProvenanceChecker); | 773 SetDnsCertProvenanceCheckerFactory(CreateChromeDnsCertProvenanceChecker); |
| 774 | 774 |
| 775 if (parsed_command_line.HasSwitch(switches::kEnableWebSocketOverSpdy)) { | 775 if (parsed_command_line.HasSwitch(switches::kEnableWebSocketOverSpdy)) { |
| 776 // Enable WebSocket over SPDY. | 776 // Enable WebSocket over SPDY. |
| 777 net::WebSocketJob::set_websocket_over_spdy_enabled(true); | 777 net::WebSocketJob::set_websocket_over_spdy_enabled(true); |
| 778 } | 778 } |
| 779 |
| 780 if (parsed_command_line.HasSwitch(switches::kEnableHttpPipelining)) |
| 781 net::HttpStreamFactory::set_http_pipelining_enabled(true); |
| 779 } | 782 } |
| 780 | 783 |
| 781 void InitializeURLRequestThrottlerManager(net::NetLog* net_log) { | 784 void InitializeURLRequestThrottlerManager(net::NetLog* net_log) { |
| 782 net::URLRequestThrottlerManager::GetInstance()->set_enable_thread_checks( | 785 net::URLRequestThrottlerManager::GetInstance()->set_enable_thread_checks( |
| 783 true); | 786 true); |
| 784 | 787 |
| 785 // TODO(joi): Passing the NetLog here is temporary; once I switch the | 788 // TODO(joi): Passing the NetLog here is temporary; once I switch the |
| 786 // URLRequestThrottlerManager to be part of the URLRequestContext it will | 789 // URLRequestThrottlerManager to be part of the URLRequestContext it will |
| 787 // come from there. Doing it this way for now (2011/5/12) to try to fail | 790 // come from there. Doing it this way for now (2011/5/12) to try to fail |
| 788 // fast in case A/B experiment gives unexpected results. | 791 // fast in case A/B experiment gives unexpected results. |
| (...skipping 1326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2115 #if defined(OS_CHROMEOS) | 2118 #if defined(OS_CHROMEOS) |
| 2116 // To be precise, logout (browser shutdown) is not yet done, but the | 2119 // To be precise, logout (browser shutdown) is not yet done, but the |
| 2117 // remaining work is negligible, hence we say LogoutDone here. | 2120 // remaining work is negligible, hence we say LogoutDone here. |
| 2118 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", | 2121 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", |
| 2119 false); | 2122 false); |
| 2120 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); | 2123 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); |
| 2121 #endif | 2124 #endif |
| 2122 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); | 2125 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); |
| 2123 return result_code; | 2126 return result_code; |
| 2124 } | 2127 } |
| OLD | NEW |