| 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 "content/browser/browser_main_loop.h" | 5 #include "content/browser/browser_main_loop.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 #endif // !defined(USE_OPENSSL) | 233 #endif // !defined(USE_OPENSSL) |
| 234 | 234 |
| 235 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 235 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 236 SetupSandbox(parsed_command_line_); | 236 SetupSandbox(parsed_command_line_); |
| 237 #endif | 237 #endif |
| 238 | 238 |
| 239 if (parsed_command_line_.HasSwitch(switches::kDisableSSLFalseStart)) | 239 if (parsed_command_line_.HasSwitch(switches::kDisableSSLFalseStart)) |
| 240 net::SSLConfigService::DisableFalseStart(); | 240 net::SSLConfigService::DisableFalseStart(); |
| 241 if (parsed_command_line_.HasSwitch(switches::kEnableSSLCachedInfo)) | 241 if (parsed_command_line_.HasSwitch(switches::kEnableSSLCachedInfo)) |
| 242 net::SSLConfigService::EnableCachedInfo(); | 242 net::SSLConfigService::EnableCachedInfo(); |
| 243 if (parsed_command_line_.HasSwitch(switches::kEnableOriginBoundCerts)) | |
| 244 net::SSLConfigService::EnableOriginBoundCerts(); | |
| 245 if (parsed_command_line_.HasSwitch( | 243 if (parsed_command_line_.HasSwitch( |
| 246 switches::kEnableDNSCertProvenanceChecking)) { | 244 switches::kEnableDNSCertProvenanceChecking)) { |
| 247 net::SSLConfigService::EnableDNSCertProvenanceChecking(); | 245 net::SSLConfigService::EnableDNSCertProvenanceChecking(); |
| 248 } | 246 } |
| 249 | 247 |
| 250 // TODO(abarth): Should this move to InitializeNetworkOptions? This doesn't | 248 // TODO(abarth): Should this move to InitializeNetworkOptions? This doesn't |
| 251 // seem dependent on SSL initialization(). | 249 // seem dependent on SSL initialization(). |
| 252 if (parsed_command_line_.HasSwitch(switches::kEnableTcpFastOpen)) | 250 if (parsed_command_line_.HasSwitch(switches::kEnableTcpFastOpen)) |
| 253 net::set_tcp_fastopen_enabled(true); | 251 net::set_tcp_fastopen_enabled(true); |
| 254 | 252 |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 541 MessageLoopForUI::current()->PostTask(FROM_HERE, parameters_.ui_task); | 539 MessageLoopForUI::current()->PostTask(FROM_HERE, parameters_.ui_task); |
| 542 | 540 |
| 543 #if defined(OS_MACOSX) | 541 #if defined(OS_MACOSX) |
| 544 MessageLoopForUI::current()->Run(); | 542 MessageLoopForUI::current()->Run(); |
| 545 #else | 543 #else |
| 546 MessageLoopForUI::current()->RunWithDispatcher(NULL); | 544 MessageLoopForUI::current()->RunWithDispatcher(NULL); |
| 547 #endif | 545 #endif |
| 548 } | 546 } |
| 549 | 547 |
| 550 } // namespace content | 548 } // namespace content |
| OLD | NEW |