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

Unified Diff: chrome/common/chrome_switches.cc

Issue 5844001: seccomp: remove build-time flags (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | chrome/renderer/renderer_main_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_switches.cc
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 13c91fc1505223b5c927066603bf0e91f6721125..c8627be1184d6c60f115e027742792dc8621a4c9 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1347,25 +1347,19 @@ const char kTouchDevices[] = "touch-devices";
#endif
-// USE_SECCOMP_SANDBOX controls whether the seccomp sandbox is opt-in or -out.
+// SeccompSandboxEnabled() controls whether we are using Seccomp.
+// It is currently off by default on all platforms.
// TODO(evan): unify all of these once we turn the seccomp sandbox always
// on. Also remove the #include of command_line.h above.
-#if defined(USE_SECCOMP_SANDBOX)
+
// Disable the seccomp sandbox (Linux only)
const char kDisableSeccompSandbox[] = "disable-seccomp-sandbox";
-#else
// Enable the seccomp sandbox (Linux only)
const char kEnableSeccompSandbox[] = "enable-seccomp-sandbox";
-#endif
bool SeccompSandboxEnabled() {
-#if defined(USE_SECCOMP_SANDBOX)
- return !CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableSeccompSandbox);
-#else
return CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableSeccompSandbox);
-#endif
}
// -----------------------------------------------------------------------------
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | chrome/renderer/renderer_main_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698