summaryrefslogtreecommitdiffstats
path: root/chrome/app/chrome_dll_main.cc
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-04 20:24:56 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-04 20:24:56 +0000
commit5ed7c01ee895b37c12252bc63d769af26f9093ec (patch)
tree098d47c17fa79ddfaab7f8be8c0ba87dbf4ad918 /chrome/app/chrome_dll_main.cc
parente619a6e382c076a8b31b63a0f572d880a0373f9d (diff)
downloadchromium_src-5ed7c01ee895b37c12252bc63d769af26f9093ec.zip
chromium_src-5ed7c01ee895b37c12252bc63d769af26f9093ec.tar.gz
chromium_src-5ed7c01ee895b37c12252bc63d769af26f9093ec.tar.bz2
linux: make --no-sandbox work
Review URL: http://codereview.chromium.org/515019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35474 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll_main.cc')
-rw-r--r--chrome/app/chrome_dll_main.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index ee75d76..b47c82e 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -717,7 +717,7 @@ int ChromeMain(int argc, char** argv) {
#endif
std::string sandbox_cmd;
- if (sandbox_binary)
+ if (sandbox_binary && !parsed_command_line.HasSwitch(switches::kNoSandbox))
sandbox_cmd = sandbox_binary;
// Tickle the sandbox host and zygote host so they fork now.