Index: chrome/browser/resources/cryptotoken/cryptotokenapprovedorigins.js |
diff --git a/chrome/browser/resources/cryptotoken/cryptotokenapprovedorigins.js b/chrome/browser/resources/cryptotoken/cryptotokenapprovedorigins.js |
index 8b4f838c04776421a97245820109bb12ca04537d..9b3bc106583f3456b21036dd4bdfd2d9f49d4576 100644 |
--- a/chrome/browser/resources/cryptotoken/cryptotokenapprovedorigins.js |
+++ b/chrome/browser/resources/cryptotoken/cryptotokenapprovedorigins.js |
@@ -27,31 +27,31 @@ function CryptoTokenApprovedOrigin() {} |
* the type allows undefined. |
* @return {Promise<boolean>} A promise for the result of the check. |
*/ |
-CryptoTokenApprovedOrigin.prototype.isApprovedOrigin = |
- function(origin, opt_tabId) { |
+CryptoTokenApprovedOrigin.prototype.isApprovedOrigin = function( |
+ origin, opt_tabId) { |
return new Promise(function(resolve, reject) { |
- if (opt_tabId === undefined) { |
+ if (opt_tabId === undefined) { |
+ resolve(false); |
+ return; |
+ } |
+ var tabId = /** @type {number} */ (opt_tabId); |
+ tabInForeground(tabId).then(function(result) { |
+ if (!result) { |
resolve(false); |
return; |
} |
- var tabId = /** @type {number} */ (opt_tabId); |
- tabInForeground(tabId).then(function(result) { |
- if (!result) { |
+ if (!chrome.tabs || !chrome.tabs.get) { |
+ reject(); |
+ return; |
+ } |
+ chrome.tabs.get(tabId, function(tab) { |
+ if (chrome.runtime.lastError) { |
resolve(false); |
return; |
} |
- if (!chrome.tabs || !chrome.tabs.get) { |
- reject(); |
- return; |
- } |
- chrome.tabs.get(tabId, function(tab) { |
- if (chrome.runtime.lastError) { |
- resolve(false); |
- return; |
- } |
- var tabOrigin = getOriginFromUrl(tab.url); |
- resolve(tabOrigin == origin); |
- }); |
+ var tabOrigin = getOriginFromUrl(tab.url); |
+ resolve(tabOrigin == origin); |
}); |
+ }); |
}); |
}; |