use extensions.createTab for tabs.create

auditors: @bbondy
brave · Dec 15, 2016 · 52c12cb · 52c12cb · bbondy · Dec 15, 2016
1 parent 4f115f0
commit 52c12cb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/app/browser/tabs.js b/app/browser/tabs.js
@@ -1,7 +1,7 @@
 const appActions = require('../../js/actions/appActions')
 const messages = require('../..//js/constants/messages')
 const tabState = require('../common/state/tabState')
-const {app, extensions, webContents} = require('electron')
+const {app, extensions} = require('electron')
 const { makeImmutable } = require('../common/state/immutableUtil')
 
 let currentWebContents = {}
@@ -138,9 +138,9 @@ const api = {
     let frameProps = action.get('frameProps')
     let muted = action.get('muted')
     let tabId = frameProps.get('tabId')
-    let webContents = api.getWebContents(tabId)
-    if (webContents) {
-      webContents.setAudioMuted(muted)
+    let tab = api.getWebContents(tabId)
+    if (tab) {
+      tab.setAudioMuted(muted)
       let tabValue = getTabValue(tabId)
       return tabState.updateTab(state, { tabValue })
     }
@@ -162,8 +162,8 @@ const api = {
 
   create: (createProperties, cb = null) => {
     createProperties = makeImmutable(createProperties).toJS()
-    webContents.createTab(createProperties, (webContents) => {
-      cb && cb(webContents)
+    extensions.createTab(createProperties, (tab) => {
+      cb && cb(tab)
     })
   }
 }

diff --git a/js/components/frame.js b/js/components/frame.js
@@ -62,7 +62,7 @@ class Frame extends ImmutableComponent {
   }
 
   get frame () {
-    return windowStore.getFrame(this.props.frameKey) || {}
+    return windowStore.getFrame(this.props.frameKey) || Immutable.fromJS({})
   }
 
   get braveryDefaults () {