| 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 742 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 753 &value); | 753 &value); |
| 754 net::SpdySessionPool::set_max_sessions_per_domain(value); | 754 net::SpdySessionPool::set_max_sessions_per_domain(value); |
| 755 } | 755 } |
| 756 | 756 |
| 757 SetDnsCertProvenanceCheckerFactory(CreateChromeDnsCertProvenanceChecker); | 757 SetDnsCertProvenanceCheckerFactory(CreateChromeDnsCertProvenanceChecker); |
| 758 | 758 |
| 759 if (parsed_command_line.HasSwitch(switches::kEnableWebSocketOverSpdy)) { | 759 if (parsed_command_line.HasSwitch(switches::kEnableWebSocketOverSpdy)) { |
| 760 // Enable WebSocket over SPDY. | 760 // Enable WebSocket over SPDY. |
| 761 net::WebSocketJob::set_websocket_over_spdy_enabled(true); | 761 net::WebSocketJob::set_websocket_over_spdy_enabled(true); |
| 762 } | 762 } |
| 763 |
| 764 if (parsed_command_line.HasSwitch(switches::kEnableHttpPipelining)) |
| 765 net::HttpStreamFactory::set_http_pipelining_enabled(true); |
| 763 } | 766 } |
| 764 | 767 |
| 765 void InitializeURLRequestThrottlerManager(net::NetLog* net_log) { | 768 void InitializeURLRequestThrottlerManager(net::NetLog* net_log) { |
| 766 net::URLRequestThrottlerManager::GetInstance()->set_enable_thread_checks( | 769 net::URLRequestThrottlerManager::GetInstance()->set_enable_thread_checks( |
| 767 true); | 770 true); |
| 768 | 771 |
| 769 // TODO(joi): Passing the NetLog here is temporary; once I switch the | 772 // TODO(joi): Passing the NetLog here is temporary; once I switch the |
| 770 // URLRequestThrottlerManager to be part of the URLRequestContext it will | 773 // URLRequestThrottlerManager to be part of the URLRequestContext it will |
| 771 // come from there. Doing it this way for now (2011/5/12) to try to fail | 774 // come from there. Doing it this way for now (2011/5/12) to try to fail |
| 772 // fast in case A/B experiment gives unexpected results. | 775 // fast in case A/B experiment gives unexpected results. |
| (...skipping 1312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2085 #if defined(OS_CHROMEOS) | 2088 #if defined(OS_CHROMEOS) |
| 2086 // To be precise, logout (browser shutdown) is not yet done, but the | 2089 // To be precise, logout (browser shutdown) is not yet done, but the |
| 2087 // remaining work is negligible, hence we say LogoutDone here. | 2090 // remaining work is negligible, hence we say LogoutDone here. |
| 2088 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", | 2091 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", |
| 2089 false); | 2092 false); |
| 2090 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); | 2093 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); |
| 2091 #endif | 2094 #endif |
| 2092 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); | 2095 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); |
| 2093 return result_code; | 2096 return result_code; |
| 2094 } | 2097 } |
| OLD | NEW |