From b24e16d346d0e71b140a659815a32be9ce7cd117 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Wed, 27 Sep 2017 16:14:58 -0700
Subject: re-enabled x-metamask-origin for mascara

---
 app/scripts/metamask-controller.js | 2 +-
 app/scripts/platforms/extension.js | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'app/scripts')

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 4d149545a..fef16c3a9 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -196,7 +196,7 @@ module.exports = class MetamaskController extends EventEmitter {
       },
       // rpc data source
       rpcUrl: this.networkController.getCurrentRpcAddress(),
-      originHttpHeaderKey: this.platform.isExtension ? 'X-Metamask-Origin' : undefined,
+      originHttpHeaderKey: 'X-Metamask-Origin',
       // account mgmt
       getAccounts: (cb) => {
         const isUnlocked = this.keyringController.memStore.getState().isUnlocked
diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js
index d97138207..0afe04b74 100644
--- a/app/scripts/platforms/extension.js
+++ b/app/scripts/platforms/extension.js
@@ -5,10 +5,6 @@ class ExtensionPlatform {
   //
   // Public
   //
-  get isExtension () {
-    return true
-  }
-
   reload () {
     extension.runtime.reload()
   }
-- 
cgit v1.2.3