| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 534 std::string process_type = | 534 std::string process_type = |
| 535 command_line.GetSwitchValueASCII(switches::kProcessType); | 535 command_line.GetSwitchValueASCII(switches::kProcessType); |
| 536 | 536 |
| 537 if (process_type == switches::kRendererProcess) { | 537 if (process_type == switches::kRendererProcess) { |
| 538 static breakpad::CrashHandlerHostLinux* crash_handler = NULL; | 538 static breakpad::CrashHandlerHostLinux* crash_handler = NULL; |
| 539 if (!crash_handler) | 539 if (!crash_handler) |
| 540 crash_handler = CreateCrashHandlerHost(process_type); | 540 crash_handler = CreateCrashHandlerHost(process_type); |
| 541 return crash_handler->GetDeathSignalSocket(); | 541 return crash_handler->GetDeathSignalSocket(); |
| 542 } | 542 } |
| 543 | 543 |
| 544 if (process_type == switches::kPluginProcess) { | |
| 545 static breakpad::CrashHandlerHostLinux* crash_handler = NULL; | |
| 546 if (!crash_handler) | |
| 547 crash_handler = CreateCrashHandlerHost(process_type); | |
| 548 return crash_handler->GetDeathSignalSocket(); | |
| 549 } | |
| 550 | |
| 551 if (process_type == switches::kPpapiPluginProcess) { | 544 if (process_type == switches::kPpapiPluginProcess) { |
| 552 static breakpad::CrashHandlerHostLinux* crash_handler = NULL; | 545 static breakpad::CrashHandlerHostLinux* crash_handler = NULL; |
| 553 if (!crash_handler) | 546 if (!crash_handler) |
| 554 crash_handler = CreateCrashHandlerHost(process_type); | 547 crash_handler = CreateCrashHandlerHost(process_type); |
| 555 return crash_handler->GetDeathSignalSocket(); | 548 return crash_handler->GetDeathSignalSocket(); |
| 556 } | 549 } |
| 557 | 550 |
| 558 if (process_type == switches::kGpuProcess) { | 551 if (process_type == switches::kGpuProcess) { |
| 559 static breakpad::CrashHandlerHostLinux* crash_handler = NULL; | 552 static breakpad::CrashHandlerHostLinux* crash_handler = NULL; |
| 560 if (!crash_handler) | 553 if (!crash_handler) |
| (...skipping 1113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1674 static const char* const kSwitchNames[] = { | 1667 static const char* const kSwitchNames[] = { |
| 1675 extensions::switches::kAllowHTTPBackgroundPage, | 1668 extensions::switches::kAllowHTTPBackgroundPage, |
| 1676 extensions::switches::kEnableExperimentalExtensionApis, | 1669 extensions::switches::kEnableExperimentalExtensionApis, |
| 1677 extensions::switches::kExtensionsOnChromeURLs, | 1670 extensions::switches::kExtensionsOnChromeURLs, |
| 1678 extensions::switches::kWhitelistedExtensionID, | 1671 extensions::switches::kWhitelistedExtensionID, |
| 1679 }; | 1672 }; |
| 1680 | 1673 |
| 1681 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 1674 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
| 1682 arraysize(kSwitchNames)); | 1675 arraysize(kSwitchNames)); |
| 1683 #endif | 1676 #endif |
| 1684 } else if (process_type == switches::kPluginProcess) { | |
| 1685 #if defined(OS_CHROMEOS) | |
| 1686 static const char* const kSwitchNames[] = { | |
| 1687 chromeos::switches::kLoginProfile, | |
| 1688 }; | |
| 1689 | |
| 1690 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | |
| 1691 arraysize(kSwitchNames)); | |
| 1692 #endif | |
| 1693 } else if (process_type == switches::kZygoteProcess) { | 1677 } else if (process_type == switches::kZygoteProcess) { |
| 1694 static const char* const kSwitchNames[] = { | 1678 static const char* const kSwitchNames[] = { |
| 1695 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. | 1679 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. |
| 1696 switches::kDisableBundledPpapiFlash, | 1680 switches::kDisableBundledPpapiFlash, |
| 1697 #if !defined(DISABLE_NACL) | 1681 #if !defined(DISABLE_NACL) |
| 1698 switches::kEnableNaClDebug, | 1682 switches::kEnableNaClDebug, |
| 1699 switches::kEnableNaClNonSfiMode, | 1683 switches::kEnableNaClNonSfiMode, |
| 1700 switches::kForcePNaClSubzero, | 1684 switches::kForcePNaClSubzero, |
| 1701 switches::kNaClDangerousNoSandboxNonSfi, | 1685 switches::kNaClDangerousNoSandboxNonSfi, |
| 1702 #endif | 1686 #endif |
| (...skipping 1272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2975 if (channel <= kMaxDisableEncryptionChannel) { | 2959 if (channel <= kMaxDisableEncryptionChannel) { |
| 2976 static const char* const kWebRtcDevSwitchNames[] = { | 2960 static const char* const kWebRtcDevSwitchNames[] = { |
| 2977 switches::kDisableWebRtcEncryption, | 2961 switches::kDisableWebRtcEncryption, |
| 2978 }; | 2962 }; |
| 2979 to_command_line->CopySwitchesFrom(from_command_line, | 2963 to_command_line->CopySwitchesFrom(from_command_line, |
| 2980 kWebRtcDevSwitchNames, | 2964 kWebRtcDevSwitchNames, |
| 2981 arraysize(kWebRtcDevSwitchNames)); | 2965 arraysize(kWebRtcDevSwitchNames)); |
| 2982 } | 2966 } |
| 2983 } | 2967 } |
| 2984 #endif // defined(ENABLE_WEBRTC) | 2968 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |