m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

re-enabled x-metamask-origin for mascara

Browse Source
This commit is contained in:
frankiebee 2017-09-27 16:14:58 -07:00
parent 4979f5902f
commit b24e16d346
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/metamask-controller.js
View File

@ -196,7 +196,7 @@ module.exports = class MetamaskController extends EventEmitter {
}, },
// rpc data source // rpc data source
rpcUrl: this.networkController.getCurrentRpcAddress(), rpcUrl: this.networkController.getCurrentRpcAddress(),
originHttpHeaderKey: this.platform.isExtension ? 'X-Metamask-Origin' : undefined, originHttpHeaderKey: 'X-Metamask-Origin',
// account mgmt // account mgmt
getAccounts: (cb) => { getAccounts: (cb) => {
const isUnlocked = this.keyringController.memStore.getState().isUnlocked const isUnlocked = this.keyringController.memStore.getState().isUnlocked

4
app/scripts/platforms/extension.js
View File

@ -5,10 +5,6 @@ class ExtensionPlatform {
// //
// Public // Public
// //
get isExtension () {
return true
}
reload () { reload () {
extension.runtime.reload() extension.runtime.reload()
} }