github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-11 23:25:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into as-ns-startup-snapshot

Browse Source
This commit is contained in:
Antonio Scandurra
2017-03-10 16:47:27 +01:00
parent e61919cd60 c27ee0286c
commit 4b98843fae
4 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main-process/atom-application.coffee
View File

@@ -283,6 +283,9 @@ class AtomApplication
@disposable.add ipcHelpers.on ipcMain, 'restart-application', =>
@restart()
@disposable.add ipcHelpers.on ipcMain, 'resolve-proxy', (event, requestId, url) ->
event.sender.session.resolveProxy url, (proxy) -> event.sender.send('did-resolve-proxy', requestId, proxy)
@disposable.add ipcHelpers.on ipcMain, 'did-change-history-manager', (event) =>
for atomWindow in @windows
webContents = atomWindow.browserWindow.webContents