mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #9983 from electron/devtools-mixed-sandbox

Browse source 
Fix devtools open in mixed sandbox
This commit is contained in:
Kevin Sawicki 2017-07-14 09:41:56 -07:00 • committed by GitHub
commit 48f5a66f87
4 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/app/atom_main_delegate.cc
View file

@ -154,7 +154,9 @@ content::ContentBrowserClient* AtomMainDelegate::CreateContentBrowserClient() {
content::ContentRendererClient*
AtomMainDelegate::CreateContentRendererClient() {
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableSandbox)) {
switches::kEnableSandbox) ||
!base::CommandLine::ForCurrentProcess()->HasSwitch(
::switches::kNoSandbox)) {
renderer_client_.reset(new AtomSandboxedRendererClient);
} else {
renderer_client_.reset(new AtomRendererClient);