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

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

Issue 1005173006: Add a switch for using PNaCl Subzero and use it for -O0 translation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: stuff Created 5 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
OLDNEW
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 1402 matching lines...) Expand 10 before | Expand all | Expand 10 after
1413 switches::kDisableBundledPpapiFlash, 1413 switches::kDisableBundledPpapiFlash,
1414 switches::kDisableCastStreamingHWEncoding, 1414 switches::kDisableCastStreamingHWEncoding,
1415 switches::kDisableJavaScriptHarmonyShipping, 1415 switches::kDisableJavaScriptHarmonyShipping,
1416 switches::kDisableNewBookmarkApps, 1416 switches::kDisableNewBookmarkApps,
1417 switches::kDisableOutOfProcessPdf, 1417 switches::kDisableOutOfProcessPdf,
1418 switches::kEnableBenchmarking, 1418 switches::kEnableBenchmarking,
1419 switches::kEnableNaCl, 1419 switches::kEnableNaCl,
1420 #if !defined(DISABLE_NACL) 1420 #if !defined(DISABLE_NACL)
1421 switches::kEnableNaClDebug, 1421 switches::kEnableNaClDebug,
1422 switches::kEnableNaClNonSfiMode, 1422 switches::kEnableNaClNonSfiMode,
1423 switches::kEnablePNaClSubzero,
1423 #endif 1424 #endif
1424 switches::kEnableNetBenchmarking, 1425 switches::kEnableNetBenchmarking,
1425 switches::kEnableNewBookmarkApps, 1426 switches::kEnableNewBookmarkApps,
1426 switches::kEnableOutOfProcessPdf, 1427 switches::kEnableOutOfProcessPdf,
1427 switches::kEnablePluginPlaceholderShadowDom, 1428 switches::kEnablePluginPlaceholderShadowDom,
1428 switches::kJavaScriptHarmony, 1429 switches::kJavaScriptHarmony,
1429 switches::kMessageLoopHistogrammer, 1430 switches::kMessageLoopHistogrammer,
1430 switches::kPpapiFlashArgs, 1431 switches::kPpapiFlashArgs,
1431 switches::kPpapiFlashPath, 1432 switches::kPpapiFlashPath,
1432 switches::kPpapiFlashVersion, 1433 switches::kPpapiFlashVersion,
(...skipping 26 matching lines...) Expand all
1459 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1460 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1460 arraysize(kSwitchNames)); 1461 arraysize(kSwitchNames));
1461 #endif 1462 #endif
1462 } else if (process_type == switches::kZygoteProcess) { 1463 } else if (process_type == switches::kZygoteProcess) {
1463 static const char* const kSwitchNames[] = { 1464 static const char* const kSwitchNames[] = {
1464 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. 1465 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox.
1465 switches::kDisableBundledPpapiFlash, 1466 switches::kDisableBundledPpapiFlash,
1466 #if !defined(DISABLE_NACL) 1467 #if !defined(DISABLE_NACL)
1467 switches::kEnableNaClDebug, 1468 switches::kEnableNaClDebug,
1468 switches::kEnableNaClNonSfiMode, 1469 switches::kEnableNaClNonSfiMode,
1470 switches::kEnablePNaClSubzero,
1469 switches::kNaClDangerousNoSandboxNonSfi, 1471 switches::kNaClDangerousNoSandboxNonSfi,
1470 switches::kUseNaClHelperNonSfi, 1472 switches::kUseNaClHelperNonSfi,
1471 #endif 1473 #endif
1472 switches::kPpapiFlashPath, 1474 switches::kPpapiFlashPath,
1473 switches::kPpapiFlashVersion, 1475 switches::kPpapiFlashVersion,
1474 }; 1476 };
1475 1477
1476 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1478 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1477 arraysize(kSwitchNames)); 1479 arraysize(kSwitchNames));
1478 } else if (process_type == switches::kGpuProcess) { 1480 } else if (process_type == switches::kGpuProcess) {
(...skipping 1094 matching lines...) Expand 10 before | Expand all | Expand 10 after
2573 switches::kDisableWebRtcEncryption, 2575 switches::kDisableWebRtcEncryption,
2574 }; 2576 };
2575 to_command_line->CopySwitchesFrom(from_command_line, 2577 to_command_line->CopySwitchesFrom(from_command_line,
2576 kWebRtcDevSwitchNames, 2578 kWebRtcDevSwitchNames,
2577 arraysize(kWebRtcDevSwitchNames)); 2579 arraysize(kWebRtcDevSwitchNames));
2578 } 2580 }
2579 } 2581 }
2580 #endif // defined(ENABLE_WEBRTC) 2582 #endif // defined(ENABLE_WEBRTC)
2581 2583
2582 } // namespace chrome 2584 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/test/nacl/nacl_browsertest.cc » ('j') | chrome/test/nacl/nacl_browsertest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698