Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Side by Side Diff: chrome/browser/browser_main.cc

Issue 6792032: net: remove forced renegotiation checks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 212
213 if (parsed_command_line().HasSwitch(switches::kEnableBenchmarking)) 213 if (parsed_command_line().HasSwitch(switches::kEnableBenchmarking))
214 base::FieldTrial::EnableBenchmarking(); 214 base::FieldTrial::EnableBenchmarking();
215 215
216 InitializeSSL(); 216 InitializeSSL();
217 217
218 if (parsed_command_line().HasSwitch(switches::kEnableDNSSECCerts)) 218 if (parsed_command_line().HasSwitch(switches::kEnableDNSSECCerts))
219 net::SSLConfigService::EnableDNSSEC(); 219 net::SSLConfigService::EnableDNSSEC();
220 if (parsed_command_line().HasSwitch(switches::kDisableSSLFalseStart)) 220 if (parsed_command_line().HasSwitch(switches::kDisableSSLFalseStart))
221 net::SSLConfigService::DisableFalseStart(); 221 net::SSLConfigService::DisableFalseStart();
222 if (parsed_command_line().HasSwitch(switches::kAllowSSLMITMProxies))
223 net::SSLConfigService::AllowMITMProxies();
224 // Disabled to stop people playing with it. 222 // Disabled to stop people playing with it.
225 // if (parsed_command_line().HasSwitch(switches::kEnableSnapStart)) 223 // if (parsed_command_line().HasSwitch(switches::kEnableSnapStart))
226 // net::SSLConfigService::EnableSnapStart(); 224 // net::SSLConfigService::EnableSnapStart();
227 if (parsed_command_line().HasSwitch( 225 if (parsed_command_line().HasSwitch(
228 switches::kEnableDNSCertProvenanceChecking)) { 226 switches::kEnableDNSCertProvenanceChecking)) {
229 net::SSLConfigService::EnableDNSCertProvenanceChecking(); 227 net::SSLConfigService::EnableDNSCertProvenanceChecking();
230 } 228 }
231 229
232 if (parsed_command_line().HasSwitch(switches::kEnableTcpFastOpen)) 230 if (parsed_command_line().HasSwitch(switches::kEnableTcpFastOpen))
233 net::set_tcp_fastopen_enabled(true); 231 net::set_tcp_fastopen_enabled(true);
(...skipping 1641 matching lines...) Expand 10 before | Expand all | Expand 10 after
1875 #if defined(OS_CHROMEOS) 1873 #if defined(OS_CHROMEOS)
1876 // To be precise, logout (browser shutdown) is not yet done, but the 1874 // To be precise, logout (browser shutdown) is not yet done, but the
1877 // remaining work is negligible, hence we say LogoutDone here. 1875 // remaining work is negligible, hence we say LogoutDone here.
1878 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 1876 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
1879 false); 1877 false);
1880 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 1878 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
1881 #endif 1879 #endif
1882 TRACE_EVENT_END("BrowserMain", 0, 0); 1880 TRACE_EVENT_END("BrowserMain", 0, 0);
1883 return result_code; 1881 return result_code;
1884 } 1882 }
OLDNEW
« no previous file with comments | « no previous file | chrome/common/chrome_switches.h » ('j') | net/http/http_stream_factory_impl_job.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698