summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/extensions/browser_actions_controller.mm
diff options
context:
space:
mode:
authorandybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-04 23:41:25 +0000
committerandybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-04 23:41:25 +0000
commit4d9ce39dd68140342a275d685b9136ac92a3e475 (patch)
tree2795ef3c96f7d39b85de4ceccc2ff8ed2e2e98e5 /chrome/browser/cocoa/extensions/browser_actions_controller.mm
parent0f7c619654e11fde38e5189172f0c90fb2e74b52 (diff)
downloadchromium_src-4d9ce39dd68140342a275d685b9136ac92a3e475.zip
chromium_src-4d9ce39dd68140342a275d685b9136ac92a3e475.tar.gz
chromium_src-4d9ce39dd68140342a275d685b9136ac92a3e475.tar.bz2
[Mac] Fixes bug where clicking a Browser Action button twice quickly will result in a sticky popup from the original click.
BUG=31097 TEST=Click on a browser action button (with a popup) twice very quickly. A popup should show up, but once you click outside of it, it should not remain. Review URL: http://codereview.chromium.org/524023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35494 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/extensions/browser_actions_controller.mm')
-rw-r--r--chrome/browser/cocoa/extensions/browser_actions_controller.mm4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/cocoa/extensions/browser_actions_controller.mm
index ac6ae70..f60dd88 100644
--- a/chrome/browser/cocoa/extensions/browser_actions_controller.mm
+++ b/chrome/browser/cocoa/extensions/browser_actions_controller.mm
@@ -443,6 +443,10 @@ class ExtensionsServiceObserverBridge : public NotificationObserver {
// Adjust the anchor point to be at the center of the browser action button.
arrowPoint.x += kBrowserActionWidth / 2;
+ // Close any existing (or loading) popup owned by this controller.
+ if (popupController_)
+ [self hidePopup];
+
popupController_ = [ExtensionPopupController showURL:action->popup_url()
inBrowser:browser_
anchoredAt:arrowPoint