Index: chrome/renderer/resources/extensions/browser_action_custom_bindings.js |
diff --git a/chrome/renderer/resources/extensions/browser_action_custom_bindings.js b/chrome/renderer/resources/extensions/browser_action_custom_bindings.js |
index 9a9fae08eea5eea998faef958d0bc7d7e026d969..9bec48b1303a342c8a346830991c495af266b883 100644 |
--- a/chrome/renderer/resources/extensions/browser_action_custom_bindings.js |
+++ b/chrome/renderer/resources/extensions/browser_action_custom_bindings.js |
@@ -19,14 +19,15 @@ binding.registerCustomHook(function(bindingsAPI) { |
apiFunctions.setCustomCallback('openPopup', |
function(name, request, response) { |
- if (chrome.runtime.lastError) |
- throw new Error(chrome.runtime.lastError.message); |
- |
if (!request.callback) |
return; |
- var views = getExtensionViews(-1, 'POPUP'); |
- request.callback(views.length > 0 ? views[0] : null); |
+ if (chrome.runtime.lastError) { |
+ request.callback(); |
+ } else { |
+ var views = getExtensionViews(-1, 'POPUP'); |
+ request.callback(views.length > 0 ? views[0] : null); |
+ } |
request.callback = null; |
}); |
}); |