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

Unified Diff: services/shell/runner/host/child_process_host.cc

Issue 2174983002: OS_LINUX and OS_ANDROID are mutually exclusive. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/shell/runner/host/child_process_base.cc ('k') | ui/views/mus/aura_init.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/shell/runner/host/child_process_host.cc
diff --git a/services/shell/runner/host/child_process_host.cc b/services/shell/runner/host/child_process_host.cc
index f24fdcdd26eefe31dd01a997cdbc6594f3ea2927..30195b5404f6da9fc8c06e5386c1f7ecddb4a20b 100644
--- a/services/shell/runner/host/child_process_host.cc
+++ b/services/shell/runner/host/child_process_host.cc
@@ -26,7 +26,7 @@
#include "services/shell/runner/common/client_util.h"
#include "services/shell/runner/common/switches.h"
-#if defined(OS_LINUX) && !defined(OS_ANDROID)
+#if defined(OS_LINUX)
#include "sandbox/linux/services/namespace_sandbox.h"
#endif
@@ -177,7 +177,7 @@ void ChildProcessHost::DoLaunch(
#endif
DVLOG(2) << "Launching child with command line: "
<< child_command_line->GetCommandLineString();
-#if defined(OS_LINUX) && !defined(OS_ANDROID)
+#if defined(OS_LINUX)
if (start_sandboxed_) {
child_process_ =
sandbox::NamespaceSandbox::LaunchProcess(*child_command_line, options);
« no previous file with comments | « services/shell/runner/host/child_process_base.cc ('k') | ui/views/mus/aura_init.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698