Merge branch 'master' of https://github.com/electron/electron

2016-05-11 15:15:15 +09:00 · 2016-05-11 15:15:15 +09:00 · 2cd41b2f84
commit 2cd41b2f84
parent 0f52a6da39 71704fc5d8
11 changed files with 40 additions and 14 deletions
--- a/lib/browser/api/app.js
+++ b/lib/browser/api/app.js
@ -31,6 +31,7 @@ if (process.platform === 'darwin') {
      return bindings.dockBounce(type)
    },
    cancelBounce: bindings.dockCancelBounce,
+    downloadFinished: bindings.dockDownloadFinished,
    setBadge: bindings.dockSetBadgeText,
    getBadge: bindings.dockGetBadgeText,
    hide: bindings.dockHide,