github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

🎨

Browse Source
This commit is contained in:
Hari Juturu
2017-07-11 18:29:59 -07:00
parent 9a3b78d9fe
commit 80bd6a3e91
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
atom/app/atom_main_delegate.cc
View File

@@ -154,7 +154,7 @@ 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);

2
spec/api-app-spec.js
View File

@@ -567,7 +567,7 @@ describe('app module', function () {
})
})
describe.only('mixed sandbox option', function () {
describe('mixed sandbox option', function () {
// FIXME Get these specs running on Linux
if (process.platform === 'linux') return

4
spec/fixtures/api/mixed-sandbox-app/main.js vendored
View File

@@ -42,8 +42,8 @@ app.once('ready', () => {
let connected = false
function finish () {
if (connected && argv.sandbox != null && argv.noSandbox != null
&& argv.noSandboxDevtools != null && argv.sandboxDevtools != null) {
if (connected && argv.sandbox != null && argv.noSandbox != null &&
argv.noSandboxDevtools != null && argv.sandboxDevtools != null) {
client.once('end', () => {
app.exit(0)
})