Remove deprecated APIs

diff --git a/lib/browser/api/app.js b/lib/browser/api/app.js
index 0487270ce7b34a00edd2476f2a1b4f2ab653d761..f8a4d3e2913e3c99a284b6b9c90a588f3d5cfccd 100644 (file)
--- a/lib/browser/api/app.js
+++ b/lib/browser/api/app.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const electron = require('electron')
-const {deprecate, session, Menu} = electron
+const {session, Menu} = electron
 const EventEmitter = require('events').EventEmitter
 
 const bindings = process.atomBinding('app')
@@ -63,61 +63,10 @@ for (i = 0, len = ref1.length; i < len; i++) {
   fn(ref1[i])
 }
 
-// Deprecated.
-app.getHomeDir = deprecate('app.getHomeDir', 'app.getPath', function () {
-  return this.getPath('home')
-})
-app.getDataPath = deprecate('app.getDataPath', 'app.getPath', function () {
-  return this.getPath('userData')
-})
-app.setDataPath = deprecate('app.setDataPath', 'app.setPath', function (path) {
-  return this.setPath('userData', path)
-})
-app.resolveProxy = deprecate('app.resolveProxy', 'session.defaultSession.resolveProxy', function (url, callback) {
-  return session.defaultSession.resolveProxy(url, callback)
-})
-deprecate.rename(app, 'terminate', 'quit')
-deprecate.event(app, 'finish-launching', 'ready', function () {
-  // give default app a chance to setup default menu.
-  setImmediate(() => {
-    this.emit('finish-launching')
-  })
-})
-deprecate.event(app, 'activate-with-no-open-windows', 'activate', function (event, hasVisibleWindows) {
-  if (!hasVisibleWindows) {
-    return this.emit('activate-with-no-open-windows', event)
-  }
-})
-deprecate.event(app, 'select-certificate', 'select-client-certificate')
-if (process.platform === 'win32') {
-  app.isAeroGlassEnabled = deprecate('app.isAeroGlassEnabled', 'systemPreferences.isAeroGlassEnabled', function () {
-    return electron.systemPreferences.isAeroGlassEnabled()
-  })
-} else if (process.platform === 'darwin') {
-  app.isDarkMode = deprecate('app.isDarkMode', 'systemPreferences.isDarkMode', function () {
-    return electron.systemPreferences.isDarkMode()
-  })
-  app.on = app.addListener = function (event, listener) {
-    if (event === 'platform-theme-changed') {
-      deprecate.warn('platform-theme-changed event', "systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', callback)")
-      electron.systemPreferences.subscribeNotification('AppleInterfaceThemeChangedNotification', function () {
-        app.emit('platform-theme-changed')
-      })
-    }
-    EventEmitter.prototype.addListener.call(app, event, listener)
-  }
-}
-
 // Wrappers for native classes.
 var wrapDownloadItem = function (downloadItem) {
   // downloadItem is an EventEmitter.
   Object.setPrototypeOf(downloadItem, EventEmitter.prototype)
-
-  // Deprecated.
-  deprecate.property(downloadItem, 'url', 'getURL')
-  deprecate.property(downloadItem, 'filename', 'getFilename')
-  deprecate.property(downloadItem, 'mimeType', 'getMimeType')
-  return deprecate.rename(downloadItem, 'getUrl', 'getURL')
 }
 
 downloadItemBindings._setWrapDownloadItem(wrapDownloadItem)

diff --git a/lib/browser/api/auto-updater.js b/lib/browser/api/auto-updater.js
index 2b5133070f416f6e5ea2ccf0f95e375456d37f62..f99d3218e430fda86ef8b7b1ec3d228e59b3e41b 100644 (file)
--- a/lib/browser/api/auto-updater.js
+++ b/lib/browser/api/auto-updater.js
@@ -1,7 +1,2 @@
-const deprecate = require('electron').deprecate
 const autoUpdater = process.platform === 'win32' ? require('./auto-updater/auto-updater-win') : require('./auto-updater/auto-updater-native')
-
-// Deprecated.
-deprecate.rename(autoUpdater, 'setFeedUrl', 'setFeedURL')
-
 module.exports = autoUpdater

diff --git a/lib/browser/api/browser-window.js b/lib/browser/api/browser-window.js
index c9d63278f97450548e861842a21ddb84154f8628..7eec5c1cc44105b8083c79c48c93ca96fe64c258 100644 (file)
--- a/lib/browser/api/browser-window.js
+++ b/lib/browser/api/browser-window.js
@@ -196,34 +196,6 @@ BrowserWindow.prototype.inspectServiceWorker = function () {
   return this.webContents.inspectServiceWorker()
 }
 
-// Deprecated.
-deprecate.member(BrowserWindow, 'undo', 'webContents')
-deprecate.member(BrowserWindow, 'redo', 'webContents')
-deprecate.member(BrowserWindow, 'cut', 'webContents')
-deprecate.member(BrowserWindow, 'copy', 'webContents')
-deprecate.member(BrowserWindow, 'paste', 'webContents')
-deprecate.member(BrowserWindow, 'selectAll', 'webContents')
-deprecate.member(BrowserWindow, 'reloadIgnoringCache', 'webContents')
-deprecate.member(BrowserWindow, 'isLoading', 'webContents')
-deprecate.member(BrowserWindow, 'isWaitingForResponse', 'webContents')
-deprecate.member(BrowserWindow, 'stop', 'webContents')
-deprecate.member(BrowserWindow, 'isCrashed', 'webContents')
-deprecate.member(BrowserWindow, 'print', 'webContents')
-deprecate.member(BrowserWindow, 'printToPDF', 'webContents')
-deprecate.rename(BrowserWindow, 'restart', 'reload')
-deprecate.rename(BrowserWindow, 'loadUrl', 'loadURL')
-deprecate.rename(BrowserWindow, 'getUrl', 'getURL')
-
-BrowserWindow.prototype.executeJavaScriptInDevTools = deprecate('executeJavaScriptInDevTools', 'devToolsWebContents.executeJavaScript', function (code) {
-  var ref1
-  return (ref1 = this.devToolsWebContents) != null ? ref1.executeJavaScript(code) : void 0
-})
-
-BrowserWindow.prototype.getPageTitle = deprecate('getPageTitle', 'webContents.getTitle', function () {
-  var ref1
-  return (ref1 = this.webContents) != null ? ref1.getTitle() : void 0
-})
-
 const isDeprecatedKey = function (key) {
   return key.indexOf('-') >= 0
 }

diff --git a/lib/browser/api/ipc.js b/lib/browser/api/ipc.js
index cdba49c8248586f679d9d273a495202050482d54..6b7f04d2aed2ae786b485fa8a307342daa757fd4 100644 (file)
--- a/lib/browser/api/ipc.js
+++ b/lib/browser/api/ipc.js
@@ -1,7 +1,2 @@
-const deprecate = require('electron').deprecate
 const ipcMain = require('electron').ipcMain
-
-// This module is deprecated, we mirror everything from ipcMain.
-deprecate.warn('ipc module', 'require("electron").ipcMain')
-
 module.exports = ipcMain

diff --git a/lib/browser/api/tray.js b/lib/browser/api/tray.js
index ce67dbe117a283220c58001075fe8e80e0512e76..5142120a5695af8a6ff58a38147a21cdf3777b8c 100644 (file)
--- a/lib/browser/api/tray.js
+++ b/lib/browser/api/tray.js
@@ -1,16 +1,9 @@
-const deprecate = require('electron').deprecate
 const EventEmitter = require('events').EventEmitter
 const Tray = process.atomBinding('tray').Tray
 
 Object.setPrototypeOf(Tray.prototype, EventEmitter.prototype)
 
 Tray.prototype._init = function () {
-  // Deprecated.
-  deprecate.rename(this, 'popContextMenu', 'popUpContextMenu')
-  deprecate.event(this, 'clicked', 'click')
-  deprecate.event(this, 'double-clicked', 'double-click')
-  deprecate.event(this, 'right-clicked', 'right-click')
-  return deprecate.event(this, 'balloon-clicked', 'balloon-click')
 }
 
 Tray.prototype.setContextMenu = function (menu) {

diff --git a/lib/browser/api/web-contents.js b/lib/browser/api/web-contents.js
index 823351ebe11662a1e5150e363ba3ad5f7a1bc529..0ccb51b19b0945117d4435e673800ee50c15c457 100644 (file)
--- a/lib/browser/api/web-contents.js
+++ b/lib/browser/api/web-contents.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const EventEmitter = require('events').EventEmitter
-const deprecate = require('electron').deprecate
 const ipcMain = require('electron').ipcMain
 const NavigationController = require('electron').NavigationController
 const Menu = require('electron').Menu
@@ -160,13 +159,6 @@ let wrapWebContents = function (webContents) {
     })
   })
 
-  // Deprecated.
-  deprecate.rename(webContents, 'loadUrl', 'loadURL')
-  deprecate.rename(webContents, 'getUrl', 'getURL')
-  deprecate.event(webContents, 'page-title-set', 'page-title-updated', function (...args) {
-    return this.emit.apply(this, ['page-title-set'].concat(args))
-  })
-
   webContents.printToPDF = function (options, callback) {
     var printingSetting
     printingSetting = {

diff --git a/lib/common/api/native-image.js b/lib/common/api/native-image.js
index ebb06138210ef6a2a2eaf222aad57deba2277fa0..614298f51a0e2800e707c667424fe795a48de1c0 100644 (file)
--- a/lib/common/api/native-image.js
+++ b/lib/common/api/native-image.js
@@ -1,7 +1 @@
-const deprecate = require('electron').deprecate
-const nativeImage = process.atomBinding('native_image')
-
-// Deprecated.
-deprecate.rename(nativeImage, 'createFromDataUrl', 'createFromDataURL')
-
-module.exports = nativeImage
+module.exports = process.atomBinding('native_image')

diff --git a/lib/renderer/api/web-frame.js b/lib/renderer/api/web-frame.js
index 4a152d4f36466a1861593cb271726b0cf4a88dc3..81855c391f8fd776453c34cb2c0c547c69f8cae2 100644 (file)
--- a/lib/renderer/api/web-frame.js
+++ b/lib/renderer/api/web-frame.js
@@ -1,6 +1,5 @@
 'use strict'
 
-const deprecate = require('electron').deprecate
 const EventEmitter = require('events').EventEmitter
 
 const webFrame = process.atomBinding('web_frame').webFrame
@@ -11,9 +10,4 @@ Object.setPrototypeOf(webFrame, EventEmitter.prototype)
 // Lots of webview would subscribe to webFrame's events.
 webFrame.setMaxListeners(0)
 
-// Deprecated.
-deprecate.rename(webFrame, 'registerUrlSchemeAsSecure', 'registerURLSchemeAsSecure')
-deprecate.rename(webFrame, 'registerUrlSchemeAsBypassingCSP', 'registerURLSchemeAsBypassingCSP')
-deprecate.rename(webFrame, 'registerUrlSchemeAsPrivileged', 'registerURLSchemeAsPrivileged')
-
 module.exports = webFrame

diff --git a/lib/renderer/web-view/web-view.js b/lib/renderer/web-view/web-view.js
index 20f5f07465b50369f458a0fe2ebbc4f076869838..bfe5197295c0aff517284fb3d622b176ae7de390 100644 (file)
--- a/lib/renderer/web-view/web-view.js
+++ b/lib/renderer/web-view/web-view.js
@@ -1,6 +1,5 @@
 'use strict'
 
-const deprecate = require('electron').deprecate
 const webFrame = require('electron').webFrame
 const remote = require('electron').remote
 const ipcRenderer = require('electron').ipcRenderer
@@ -432,8 +431,6 @@ var registerWebViewElement = function () {
     return internal.webContents
   }
 
-  // Deprecated.
-  deprecate.rename(proto, 'getUrl', 'getURL')
   window.WebView = webFrame.registerEmbedderCustomElement('webview', {
     prototype: proto
   })