Chromium Code Reviews| 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 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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 // Disabled to stop people playing with it. |
| 237 // if (parsed_command_line().HasSwitch(switches::kEnableSnapStart)) | 237 // if (parsed_command_line().HasSwitch(switches::kEnableSnapStart)) |
| 238 // net::SSLConfigService::EnableSnapStart(); | 238 // net::SSLConfigService::EnableSnapStart(); |
|
wtc
2011/06/17 22:57:09
Please remove these three lines (236-238), and mov
rkn
2011/06/20 21:21:09
Done.
| |
| 239 if (parsed_command_line().HasSwitch( | 239 if (parsed_command_line().HasSwitch( |
| 240 switches::kEnableDNSCertProvenanceChecking)) { | 240 switches::kEnableDNSCertProvenanceChecking)) { |
| 241 net::SSLConfigService::EnableDNSCertProvenanceChecking(); | 241 net::SSLConfigService::EnableDNSCertProvenanceChecking(); |
| 242 } | 242 } |
| 243 if (parsed_command_line().HasSwitch(switches::kEnableCachedInfo)) | |
| 244 net::SSLConfigService::EnableCachedInfo(); | |
| 243 | 245 |
| 244 // TODO(abarth): Should this move to InitializeNetworkOptions? This doesn't | 246 // TODO(abarth): Should this move to InitializeNetworkOptions? This doesn't |
| 245 // seem dependent on InitializeSSL(). | 247 // seem dependent on InitializeSSL(). |
| 246 if (parsed_command_line().HasSwitch(switches::kEnableTcpFastOpen)) | 248 if (parsed_command_line().HasSwitch(switches::kEnableTcpFastOpen)) |
| 247 net::set_tcp_fastopen_enabled(true); | 249 net::set_tcp_fastopen_enabled(true); |
| 248 | 250 |
| 249 PostEarlyInitialization(); | 251 PostEarlyInitialization(); |
| 250 } | 252 } |
| 251 | 253 |
| 252 // This will be called after the command-line has been mutated by about:flags | 254 // This will be called after the command-line has been mutated by about:flags |
| (...skipping 1735 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1988 #if defined(OS_CHROMEOS) | 1990 #if defined(OS_CHROMEOS) |
| 1989 // To be precise, logout (browser shutdown) is not yet done, but the | 1991 // To be precise, logout (browser shutdown) is not yet done, but the |
| 1990 // remaining work is negligible, hence we say LogoutDone here. | 1992 // remaining work is negligible, hence we say LogoutDone here. |
| 1991 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", | 1993 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", |
| 1992 false); | 1994 false); |
| 1993 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); | 1995 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); |
| 1994 #endif | 1996 #endif |
| 1995 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); | 1997 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); |
| 1996 return result_code; | 1998 return result_code; |
| 1997 } | 1999 } |
| OLD | NEW |