From 5e320994f4e7c1658c2fa69eb923b04939abf26b Mon Sep 17 00:00:00 2001 From: Aleksei Kuzmin Date: Tue, 10 Apr 2018 20:54:22 +0200 Subject: [PATCH] Remove content/linux_sandbox dependence on content_switches.h https://chromium-review.googlesource.com/734265 --- atom/app/atom_main_delegate.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/atom/app/atom_main_delegate.cc b/atom/app/atom_main_delegate.cc index 7e04c3f119da..40be88a55abf 100644 --- a/atom/app/atom_main_delegate.cc +++ b/atom/app/atom_main_delegate.cc @@ -22,6 +22,7 @@ #include "chrome/common/chrome_paths.h" #include "content/public/common/content_switches.h" #include "ipc/ipc_features.h" +#include "services/service_manager/sandbox/switches.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" @@ -141,7 +142,8 @@ void AtomMainDelegate::PreSandboxStartup() { if (command_line->HasSwitch(switches::kEnableSandbox)) { // Disable setuid sandbox since it is not longer required on // linux(namespace sandbox is available on most distros). - command_line->AppendSwitch(::switches::kDisableSetuidSandbox); + command_line->AppendSwitch( + service_manager::switches::kDisableSetuidSandbox); } else { // Disable renderer sandbox for most of node's functions. command_line->AppendSwitch(::switches::kNoSandbox);