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 <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 1391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1402 }; | 1402 }; |
1403 | 1403 |
1404 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 1404 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
1405 arraysize(kSwitchNames)); | 1405 arraysize(kSwitchNames)); |
1406 #endif | 1406 #endif |
1407 } else if (process_type == switches::kZygoteProcess) { | 1407 } else if (process_type == switches::kZygoteProcess) { |
1408 static const char* const kSwitchNames[] = { | 1408 static const char* const kSwitchNames[] = { |
1409 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. | 1409 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. |
1410 switches::kDisableBundledPpapiFlash, | 1410 switches::kDisableBundledPpapiFlash, |
1411 #if !defined(DISABLE_NACL) | 1411 #if !defined(DISABLE_NACL) |
| 1412 switches::kEnableNaClDebug, |
1412 switches::kEnableNaClNonSfiMode, | 1413 switches::kEnableNaClNonSfiMode, |
1413 switches::kNaClDangerousNoSandboxNonSfi, | 1414 switches::kNaClDangerousNoSandboxNonSfi, |
1414 #endif | 1415 #endif |
1415 switches::kPpapiFlashPath, | 1416 switches::kPpapiFlashPath, |
1416 switches::kPpapiFlashVersion, | 1417 switches::kPpapiFlashVersion, |
1417 }; | 1418 }; |
1418 | 1419 |
1419 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 1420 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
1420 arraysize(kSwitchNames)); | 1421 arraysize(kSwitchNames)); |
1421 } else if (process_type == switches::kGpuProcess) { | 1422 } else if (process_type == switches::kGpuProcess) { |
(...skipping 1191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2613 switches::kDisableWebRtcEncryption, | 2614 switches::kDisableWebRtcEncryption, |
2614 }; | 2615 }; |
2615 to_command_line->CopySwitchesFrom(from_command_line, | 2616 to_command_line->CopySwitchesFrom(from_command_line, |
2616 kWebRtcDevSwitchNames, | 2617 kWebRtcDevSwitchNames, |
2617 arraysize(kWebRtcDevSwitchNames)); | 2618 arraysize(kWebRtcDevSwitchNames)); |
2618 } | 2619 } |
2619 } | 2620 } |
2620 #endif // defined(ENABLE_WEBRTC) | 2621 #endif // defined(ENABLE_WEBRTC) |
2621 | 2622 |
2622 } // namespace chrome | 2623 } // namespace chrome |
OLD | NEW |