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

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

Issue 226033002: Ensure seccomp-bpf cannot be silently disabled for non-SFI NaCl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/startup/bad_flags_prompt.cc » ('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 1620 matching lines...) Expand 10 before | Expand all | Expand 10 after
1631 switches::kMemoryProfiling, 1631 switches::kMemoryProfiling,
1632 switches::kSilentDumpOnDCHECK, 1632 switches::kSilentDumpOnDCHECK,
1633 }; 1633 };
1634 1634
1635 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1635 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1636 arraysize(kSwitchNames)); 1636 arraysize(kSwitchNames));
1637 } else if (process_type == switches::kZygoteProcess) { 1637 } else if (process_type == switches::kZygoteProcess) {
1638 static const char* const kSwitchNames[] = { 1638 static const char* const kSwitchNames[] = {
1639 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. 1639 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox.
1640 switches::kDisableBundledPpapiFlash, 1640 switches::kDisableBundledPpapiFlash,
1641 switches::kNaClDangerousNoSandboxNonSfi,
jln (very slow on Chromium) 2014/04/10 19:08:24 I don't know what this is, but it shouldn't be nee
hamaji 2014/04/10 19:17:55 This is necessary to transfer the flag from browse
jln (very slow on Chromium) 2014/04/10 19:19:33 Ahh right, thanks!
1641 switches::kPpapiFlashPath, 1642 switches::kPpapiFlashPath,
1642 switches::kPpapiFlashVersion, 1643 switches::kPpapiFlashVersion,
1643 }; 1644 };
1644 1645
1645 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1646 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1646 arraysize(kSwitchNames)); 1647 arraysize(kSwitchNames));
1647 } else if (process_type == switches::kGpuProcess) { 1648 } else if (process_type == switches::kGpuProcess) {
1648 // If --ignore-gpu-blacklist is passed in, don't send in crash reports 1649 // If --ignore-gpu-blacklist is passed in, don't send in crash reports
1649 // because GPU is expected to be unreliable. 1650 // because GPU is expected to be unreliable.
1650 if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) && 1651 if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) &&
(...skipping 1108 matching lines...) Expand 10 before | Expand all | Expand 10 after
2759 switches::kDisableWebRtcEncryption, 2760 switches::kDisableWebRtcEncryption,
2760 }; 2761 };
2761 to_command_line->CopySwitchesFrom(from_command_line, 2762 to_command_line->CopySwitchesFrom(from_command_line,
2762 kWebRtcDevSwitchNames, 2763 kWebRtcDevSwitchNames,
2763 arraysize(kWebRtcDevSwitchNames)); 2764 arraysize(kWebRtcDevSwitchNames));
2764 } 2765 }
2765 } 2766 }
2766 #endif // defined(ENABLE_WEBRTC) 2767 #endif // defined(ENABLE_WEBRTC)
2767 2768
2768 } // namespace chrome 2769 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/startup/bad_flags_prompt.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698