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

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

Issue 676323002: Non-SFI mode: Add --use-nacl-helper-nonsfi flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « no previous file | components/nacl/common/nacl_paths.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1396 matching lines...) Expand 10 before | Expand all | Expand 10 after
1407 arraysize(kSwitchNames)); 1407 arraysize(kSwitchNames));
1408 #endif 1408 #endif
1409 } else if (process_type == switches::kZygoteProcess) { 1409 } else if (process_type == switches::kZygoteProcess) {
1410 static const char* const kSwitchNames[] = { 1410 static const char* const kSwitchNames[] = {
1411 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. 1411 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox.
1412 switches::kDisableBundledPpapiFlash, 1412 switches::kDisableBundledPpapiFlash,
1413 #if !defined(DISABLE_NACL) 1413 #if !defined(DISABLE_NACL)
1414 switches::kEnableNaClDebug, 1414 switches::kEnableNaClDebug,
1415 switches::kEnableNaClNonSfiMode, 1415 switches::kEnableNaClNonSfiMode,
1416 switches::kNaClDangerousNoSandboxNonSfi, 1416 switches::kNaClDangerousNoSandboxNonSfi,
1417 switches::kUseNaClHelperNonSfi,
1417 #endif 1418 #endif
1418 switches::kPpapiFlashPath, 1419 switches::kPpapiFlashPath,
1419 switches::kPpapiFlashVersion, 1420 switches::kPpapiFlashVersion,
1420 }; 1421 };
1421 1422
1422 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1423 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1423 arraysize(kSwitchNames)); 1424 arraysize(kSwitchNames));
1424 } else if (process_type == switches::kGpuProcess) { 1425 } else if (process_type == switches::kGpuProcess) {
1425 // If --ignore-gpu-blacklist is passed in, don't send in crash reports 1426 // If --ignore-gpu-blacklist is passed in, don't send in crash reports
1426 // because GPU is expected to be unreliable. 1427 // because GPU is expected to be unreliable.
(...skipping 1244 matching lines...) Expand 10 before | Expand all | Expand 10 after
2671 switches::kDisableWebRtcEncryption, 2672 switches::kDisableWebRtcEncryption,
2672 }; 2673 };
2673 to_command_line->CopySwitchesFrom(from_command_line, 2674 to_command_line->CopySwitchesFrom(from_command_line,
2674 kWebRtcDevSwitchNames, 2675 kWebRtcDevSwitchNames,
2675 arraysize(kWebRtcDevSwitchNames)); 2676 arraysize(kWebRtcDevSwitchNames));
2676 } 2677 }
2677 } 2678 }
2678 #endif // defined(ENABLE_WEBRTC) 2679 #endif // defined(ENABLE_WEBRTC)
2679 2680
2680 } // namespace chrome 2681 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | components/nacl/common/nacl_paths.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698