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 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 net::SSLConfigService::EnableDNSSEC(); | 227 net::SSLConfigService::EnableDNSSEC(); |
228 if (parsed_command_line().HasSwitch(switches::kDisableSSLFalseStart)) | 228 if (parsed_command_line().HasSwitch(switches::kDisableSSLFalseStart)) |
229 net::SSLConfigService::DisableFalseStart(); | 229 net::SSLConfigService::DisableFalseStart(); |
230 // Disabled to stop people playing with it. | 230 // Disabled to stop people playing with it. |
231 // if (parsed_command_line().HasSwitch(switches::kEnableSnapStart)) | 231 // if (parsed_command_line().HasSwitch(switches::kEnableSnapStart)) |
232 // net::SSLConfigService::EnableSnapStart(); | 232 // net::SSLConfigService::EnableSnapStart(); |
233 if (parsed_command_line().HasSwitch( | 233 if (parsed_command_line().HasSwitch( |
234 switches::kEnableDNSCertProvenanceChecking)) { | 234 switches::kEnableDNSCertProvenanceChecking)) { |
235 net::SSLConfigService::EnableDNSCertProvenanceChecking(); | 235 net::SSLConfigService::EnableDNSCertProvenanceChecking(); |
236 } | 236 } |
| 237 if (parsed_command_line().HasSwitch(switches::kEnableCachedInfo)) |
| 238 net::SSLConfigService::EnableCachedInfo(); |
237 | 239 |
238 // TODO(abarth): Should this move to InitializeNetworkOptions? This doesn't | 240 // TODO(abarth): Should this move to InitializeNetworkOptions? This doesn't |
239 // seem dependent on InitializeSSL(). | 241 // seem dependent on InitializeSSL(). |
240 if (parsed_command_line().HasSwitch(switches::kEnableTcpFastOpen)) | 242 if (parsed_command_line().HasSwitch(switches::kEnableTcpFastOpen)) |
241 net::set_tcp_fastopen_enabled(true); | 243 net::set_tcp_fastopen_enabled(true); |
242 | 244 |
243 PostEarlyInitialization(); | 245 PostEarlyInitialization(); |
244 } | 246 } |
245 | 247 |
246 // This will be called after the command-line has been mutated by about:flags | 248 // This will be called after the command-line has been mutated by about:flags |
(...skipping 1704 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1951 #if defined(OS_CHROMEOS) | 1953 #if defined(OS_CHROMEOS) |
1952 // To be precise, logout (browser shutdown) is not yet done, but the | 1954 // To be precise, logout (browser shutdown) is not yet done, but the |
1953 // remaining work is negligible, hence we say LogoutDone here. | 1955 // remaining work is negligible, hence we say LogoutDone here. |
1954 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", | 1956 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", |
1955 false); | 1957 false); |
1956 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); | 1958 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); |
1957 #endif | 1959 #endif |
1958 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); | 1960 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); |
1959 return result_code; | 1961 return result_code; |
1960 } | 1962 } |
OLD | NEW |