From 8aaa01be20860bc7f91d1d98ff8ad63a772934e6 Mon Sep 17 00:00:00 2001 From: "justinlin@chromium.org" Date: Thu, 24 Oct 2013 03:24:38 +0000 Subject: Mark window parameter for chrome.browserAction.openPopup as optional since it is not provided when opening a popup fails. Don't throw exception when openPopup fails to get the popup window. BUG=305737 Review URL: https://codereview.chromium.org/32283005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230617 0039d316-1c4b-4281-b951-d872f2087c98 --- .../resources/extensions/browser_action_custom_bindings.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'chrome/renderer') diff --git a/chrome/renderer/resources/extensions/browser_action_custom_bindings.js b/chrome/renderer/resources/extensions/browser_action_custom_bindings.js index 9a9fae0..9bec48b 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; }); }); -- cgit v1.1