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 1327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1338 switches::kDisableBundledPpapiFlash, | 1338 switches::kDisableBundledPpapiFlash, |
1339 switches::kDisableCastStreamingHWEncoding, | 1339 switches::kDisableCastStreamingHWEncoding, |
1340 switches::kDisableJavaScriptHarmonyShipping, | 1340 switches::kDisableJavaScriptHarmonyShipping, |
1341 switches::kDisableNewBookmarkApps, | 1341 switches::kDisableNewBookmarkApps, |
1342 switches::kDisableOutOfProcessPdf, | 1342 switches::kDisableOutOfProcessPdf, |
1343 switches::kEnableBenchmarking, | 1343 switches::kEnableBenchmarking, |
1344 switches::kEnableNaCl, | 1344 switches::kEnableNaCl, |
1345 #if !defined(DISABLE_NACL) | 1345 #if !defined(DISABLE_NACL) |
1346 switches::kEnableNaClDebug, | 1346 switches::kEnableNaClDebug, |
1347 switches::kEnableNaClNonSfiMode, | 1347 switches::kEnableNaClNonSfiMode, |
| 1348 switches::kEnablePNaClSubzero, |
1348 #endif | 1349 #endif |
1349 switches::kEnableNetBenchmarking, | 1350 switches::kEnableNetBenchmarking, |
1350 switches::kEnableNewBookmarkApps, | 1351 switches::kEnableNewBookmarkApps, |
1351 switches::kEnableOutOfProcessPdf, | 1352 switches::kEnableOutOfProcessPdf, |
1352 switches::kEnablePluginPlaceholderShadowDom, | 1353 switches::kEnablePluginPlaceholderShadowDom, |
1353 switches::kJavaScriptHarmony, | 1354 switches::kJavaScriptHarmony, |
1354 switches::kMessageLoopHistogrammer, | 1355 switches::kMessageLoopHistogrammer, |
1355 switches::kPpapiFlashArgs, | 1356 switches::kPpapiFlashArgs, |
1356 switches::kPpapiFlashPath, | 1357 switches::kPpapiFlashPath, |
1357 switches::kPpapiFlashVersion, | 1358 switches::kPpapiFlashVersion, |
(...skipping 26 matching lines...) Expand all Loading... |
1384 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 1385 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
1385 arraysize(kSwitchNames)); | 1386 arraysize(kSwitchNames)); |
1386 #endif | 1387 #endif |
1387 } else if (process_type == switches::kZygoteProcess) { | 1388 } else if (process_type == switches::kZygoteProcess) { |
1388 static const char* const kSwitchNames[] = { | 1389 static const char* const kSwitchNames[] = { |
1389 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. | 1390 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. |
1390 switches::kDisableBundledPpapiFlash, | 1391 switches::kDisableBundledPpapiFlash, |
1391 #if !defined(DISABLE_NACL) | 1392 #if !defined(DISABLE_NACL) |
1392 switches::kEnableNaClDebug, | 1393 switches::kEnableNaClDebug, |
1393 switches::kEnableNaClNonSfiMode, | 1394 switches::kEnableNaClNonSfiMode, |
| 1395 switches::kEnablePNaClSubzero, |
1394 switches::kNaClDangerousNoSandboxNonSfi, | 1396 switches::kNaClDangerousNoSandboxNonSfi, |
1395 switches::kUseNaClHelperNonSfi, | 1397 switches::kUseNaClHelperNonSfi, |
1396 #endif | 1398 #endif |
1397 switches::kPpapiFlashPath, | 1399 switches::kPpapiFlashPath, |
1398 switches::kPpapiFlashVersion, | 1400 switches::kPpapiFlashVersion, |
1399 }; | 1401 }; |
1400 | 1402 |
1401 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 1403 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
1402 arraysize(kSwitchNames)); | 1404 arraysize(kSwitchNames)); |
1403 } else if (process_type == switches::kGpuProcess) { | 1405 } else if (process_type == switches::kGpuProcess) { |
(...skipping 1010 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2414 switches::kDisableWebRtcEncryption, | 2416 switches::kDisableWebRtcEncryption, |
2415 }; | 2417 }; |
2416 to_command_line->CopySwitchesFrom(from_command_line, | 2418 to_command_line->CopySwitchesFrom(from_command_line, |
2417 kWebRtcDevSwitchNames, | 2419 kWebRtcDevSwitchNames, |
2418 arraysize(kWebRtcDevSwitchNames)); | 2420 arraysize(kWebRtcDevSwitchNames)); |
2419 } | 2421 } |
2420 } | 2422 } |
2421 #endif // defined(ENABLE_WEBRTC) | 2423 #endif // defined(ENABLE_WEBRTC) |
2422 | 2424 |
2423 } // namespace chrome | 2425 } // namespace chrome |
OLD | NEW |