implement nornagon suggestions

lib/browser/api/web-contents.js

@@ -287,14 +287,7 @@ WebContents.prototype.loadFile = function (filePath, options = {}) {
 }
 
 WebContents.prototype.setWindowOpenOverride = function (handler) {
-  this.windowOpenOverrideHandler = handler
-}
-
-WebContents.prototype._callWindowOpenOverride = function (event, url, frameName) {
-  if (this.windowOpenOverrideHandler) {
-    const response = this.windowOpenOverrideHandler({ url, frameName })
-    if (response === false) event.preventDefault()
-  }
+  this._windowOpenOverrideHandler = handler
 }
 
 const addReplyToEvent = (event) => {
@@ -325,7 +318,7 @@ WebContents.prototype._init = function () {
   // The navigation controller.
   NavigationController.call(this, this)
 
-  this.windowOpenOverrideHandler = null
+  this._windowOpenOverrideHandler = null
 
   // Every remote callback from renderer process would add a listener to the
   // render-view-deleted event, so ignore the listeners warning.
@@ -406,7 +399,10 @@ WebContents.prototype._init = function () {
     })
 
     this.on('-will-add-new-contents', (event, url, frameName) => {
-      this._callWindowOpenOverride(event, url, frameName)
+      if (this._windowOpenOverrideHandler) {
+        const response = this._windowOpenOverrideHandler({ url, frameName })
+        if (response === false) event.preventDefault()
+      }
     })
 
     // Create a new browser window for the native implementation of