diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-07-22 02:30:57 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-07-22 02:30:57 +0800 |
| commit | 7b85802a0fede74217dd702ddda9bea1154517eb (patch) | |
| tree | 055d903420fb1e04bc01d8bc542b389581ca4b41 /app/scripts/background.js | |
| parent | 4a9d5b1c258912acedd6f1e89fb632526d9c910b (diff) | |
| parent | 6658bea8d444281491718f8eee7bc3ae42f91b69 (diff) | |
| download | tangerine-wallet-browser-7b85802a0fede74217dd702ddda9bea1154517eb.tar tangerine-wallet-browser-7b85802a0fede74217dd702ddda9bea1154517eb.tar.gz tangerine-wallet-browser-7b85802a0fede74217dd702ddda9bea1154517eb.tar.bz2 tangerine-wallet-browser-7b85802a0fede74217dd702ddda9bea1154517eb.tar.lz tangerine-wallet-browser-7b85802a0fede74217dd702ddda9bea1154517eb.tar.xz tangerine-wallet-browser-7b85802a0fede74217dd702ddda9bea1154517eb.tar.zst tangerine-wallet-browser-7b85802a0fede74217dd702ddda9bea1154517eb.zip | |
Merge branch 'master' into usd-conversion
Diffstat (limited to 'app/scripts/background.js')
| -rw-r--r-- | app/scripts/background.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js index 801dc95cf..34c994ab7 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -9,6 +9,7 @@ const createMsgNotification = require('./lib/notifications.js').createMsgNotific const messageManager = require('./lib/message-manager') const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex const MetamaskController = require('./metamask-controller') +const extension = require('./lib/extension') const STORAGE_KEY = 'metamask-config' @@ -65,7 +66,7 @@ function showUnconfirmedTx (txParams, txData, onTxDoneCb) { // connect to other contexts // -chrome.runtime.onConnect.addListener(connectRemote) +extension.runtime.onConnect.addListener(connectRemote) function connectRemote (remotePort) { var isMetaMaskInternalProcess = (remotePort.name === 'popup') var portStream = new PortStream(remotePort) @@ -133,8 +134,8 @@ function updateBadge (state) { if (count) { label = String(count) } - chrome.browserAction.setBadgeText({ text: label }) - chrome.browserAction.setBadgeBackgroundColor({ color: '#506F8B' }) + extension.browserAction.setBadgeText({ text: label }) + extension.browserAction.setBadgeBackgroundColor({ color: '#506F8B' }) } function loadData () { |