| 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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 // if (parsed_command_line().HasSwitch(switches::kEnableSnapStart)) | 225 // if (parsed_command_line().HasSwitch(switches::kEnableSnapStart)) |
| 226 // net::SSLConfigService::EnableSnapStart(); | 226 // net::SSLConfigService::EnableSnapStart(); |
| 227 if (parsed_command_line().HasSwitch( | 227 if (parsed_command_line().HasSwitch( |
| 228 switches::kEnableDNSCertProvenanceChecking)) { | 228 switches::kEnableDNSCertProvenanceChecking)) { |
| 229 net::SSLConfigService::EnableDNSCertProvenanceChecking(); | 229 net::SSLConfigService::EnableDNSCertProvenanceChecking(); |
| 230 } | 230 } |
| 231 | 231 |
| 232 if (parsed_command_line().HasSwitch(switches::kEnableTcpFastOpen)) | 232 if (parsed_command_line().HasSwitch(switches::kEnableTcpFastOpen)) |
| 233 net::set_tcp_fastopen_enabled(true); | 233 net::set_tcp_fastopen_enabled(true); |
| 234 | 234 |
| 235 // Use SCTP transport protocol |
| 236 if (parsed_command_line().HasSwitch(switches::kUseSctp)) { |
| 237 std::string sctp_mode = |
| 238 parsed_command_line().GetSwitchValueASCII(switches::kUseSctp); |
| 239 net::HttpNetworkLayer::EnableSctp(sctp_mode); |
| 240 } |
| 241 |
| 235 PostEarlyInitialization(); | 242 PostEarlyInitialization(); |
| 236 } | 243 } |
| 237 | 244 |
| 238 // This will be called after the command-line has been mutated by about:flags | 245 // This will be called after the command-line has been mutated by about:flags |
| 239 void BrowserMainParts::SetupFieldTrials() { | 246 void BrowserMainParts::SetupFieldTrials() { |
| 240 // Note: make sure to call ConnectionFieldTrial() before | 247 // Note: make sure to call ConnectionFieldTrial() before |
| 241 // ProxyConnectionsFieldTrial(). | 248 // ProxyConnectionsFieldTrial(). |
| 242 ConnectionFieldTrial(); | 249 ConnectionFieldTrial(); |
| 243 SocketTimeoutFieldTrial(); | 250 SocketTimeoutFieldTrial(); |
| 244 ProxyConnectionsFieldTrial(); | 251 ProxyConnectionsFieldTrial(); |
| (...skipping 1630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1875 #if defined(OS_CHROMEOS) | 1882 #if defined(OS_CHROMEOS) |
| 1876 // To be precise, logout (browser shutdown) is not yet done, but the | 1883 // To be precise, logout (browser shutdown) is not yet done, but the |
| 1877 // remaining work is negligible, hence we say LogoutDone here. | 1884 // remaining work is negligible, hence we say LogoutDone here. |
| 1878 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", | 1885 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", |
| 1879 false); | 1886 false); |
| 1880 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); | 1887 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); |
| 1881 #endif | 1888 #endif |
| 1882 TRACE_EVENT_END("BrowserMain", 0, 0); | 1889 TRACE_EVENT_END("BrowserMain", 0, 0); |
| 1883 return result_code; | 1890 return result_code; |
| 1884 } | 1891 } |
| OLD | NEW |