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

Explicitly initialize session before webContents

Browse source
This commit is contained in:
Cheng Zhao 2016-06-01 14:57:35 +09:00
parent 523e8c2e1c
commit 5bb8da6073
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/browser/api/app.js
View file

@ -1,6 +1,7 @@
'use strict' 'use strict'
const {deprecate, Menu, session} = require('electron') const electron = require('electron')
const {deprecate, Menu} = electron
const {EventEmitter} = require('events') const {EventEmitter} = require('events')
const bindings = process.atomBinding('app') const bindings = process.atomBinding('app')
@ -49,7 +50,7 @@ app.allowNTLMCredentialsForAllDomains = function (allow) {
if (!this.isReady()) { if (!this.isReady()) {
this.commandLine.appendSwitch('auth-server-whitelist', domains) this.commandLine.appendSwitch('auth-server-whitelist', domains)
} else { } else {
session.defaultSession.allowNTLMCredentialsForDomains(domains) electron.session.defaultSession.allowNTLMCredentialsForDomains(domains)
} }
} }

6
lib/browser/api/web-contents.js
View file

@ -1,7 +1,11 @@
'use strict' 'use strict'
const {EventEmitter} = require('events') const {EventEmitter} = require('events')
const {ipcMain, Menu, NavigationController} = require('electron') const {ipcMain, session, Menu, NavigationController} = require('electron')
// session is not used here, the purpose is to make sure session is initalized
// before the webContents module.
session
const binding = process.atomBinding('web_contents') const binding = process.atomBinding('web_contents')
const debuggerBinding = process.atomBinding('debugger') const debuggerBinding = process.atomBinding('debugger')