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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 void BrowserMainParts::EarlyInitialization() { | 226 void BrowserMainParts::EarlyInitialization() { |
227 PreEarlyInitialization(); | 227 PreEarlyInitialization(); |
228 | 228 |
229 if (parsed_command_line().HasSwitch(switches::kEnableBenchmarking)) | 229 if (parsed_command_line().HasSwitch(switches::kEnableBenchmarking)) |
230 base::FieldTrial::EnableBenchmarking(); | 230 base::FieldTrial::EnableBenchmarking(); |
231 | 231 |
232 InitializeSSL(); | 232 InitializeSSL(); |
233 | 233 |
234 if (parsed_command_line().HasSwitch(switches::kDisableSSLFalseStart)) | 234 if (parsed_command_line().HasSwitch(switches::kDisableSSLFalseStart)) |
235 net::SSLConfigService::DisableFalseStart(); | 235 net::SSLConfigService::DisableFalseStart(); |
236 // Disabled to stop people playing with it. | 236 if (parsed_command_line().HasSwitch(switches::kEnableSSLCachedInfo)) |
237 // if (parsed_command_line().HasSwitch(switches::kEnableSnapStart)) | 237 net::SSLConfigService::EnableCachedInfo(); |
238 // net::SSLConfigService::EnableSnapStart(); | |
239 if (parsed_command_line().HasSwitch( | 238 if (parsed_command_line().HasSwitch( |
240 switches::kEnableDNSCertProvenanceChecking)) { | 239 switches::kEnableDNSCertProvenanceChecking)) { |
241 net::SSLConfigService::EnableDNSCertProvenanceChecking(); | 240 net::SSLConfigService::EnableDNSCertProvenanceChecking(); |
242 } | 241 } |
243 | 242 |
244 // TODO(abarth): Should this move to InitializeNetworkOptions? This doesn't | 243 // TODO(abarth): Should this move to InitializeNetworkOptions? This doesn't |
245 // seem dependent on InitializeSSL(). | 244 // seem dependent on InitializeSSL(). |
246 if (parsed_command_line().HasSwitch(switches::kEnableTcpFastOpen)) | 245 if (parsed_command_line().HasSwitch(switches::kEnableTcpFastOpen)) |
247 net::set_tcp_fastopen_enabled(true); | 246 net::set_tcp_fastopen_enabled(true); |
248 | 247 |
(...skipping 1736 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1985 #if defined(OS_CHROMEOS) | 1984 #if defined(OS_CHROMEOS) |
1986 // To be precise, logout (browser shutdown) is not yet done, but the | 1985 // To be precise, logout (browser shutdown) is not yet done, but the |
1987 // remaining work is negligible, hence we say LogoutDone here. | 1986 // remaining work is negligible, hence we say LogoutDone here. |
1988 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", | 1987 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", |
1989 false); | 1988 false); |
1990 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); | 1989 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); |
1991 #endif | 1990 #endif |
1992 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); | 1991 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); |
1993 return result_code; | 1992 return result_code; |
1994 } | 1993 } |
OLD | NEW |