[Mac] Fixes bug where clicking a Browser Action button twice quickly will res...

chrome/browser/cocoa/extensions/browser_actions_controller.mm

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "browser_actions_controller.h"
 
 #include <string>
 
 #include "app/gfx/canvas_paint.h"
 #include "base/sys_string_conversions.h"
@@ skipping 425 matching lines @@
     BrowserActionButton* actionButton = [buttons_ objectForKey:extensionId];
     NSRect relativeButtonBounds = [[[actionButton window] contentView]
         convertRect:[actionButton bounds]
            fromView:actionButton];
     NSPoint arrowPoint = [[actionButton window] convertBaseToScreen:NSMakePoint(
         NSMinX(relativeButtonBounds),
         NSMinY(relativeButtonBounds))];
     // 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
                                            arrowLocation:kTopRight];
   } else {
     ExtensionBrowserEventRouter::GetInstance()->BrowserActionExecuted(
        profile_, action->extension_id(), browser_);
   }
 }
 
 - (int)currentTabId {
   TabContents* selected_tab = browser_->GetSelectedTabContents();
   if (!selected_tab)
     return -1;
 
   return selected_tab->controller().session_id().id();
 }
 
 - (NSButton*)buttonWithIndex:(int)index {
   return [buttonOrder_ objectAtIndex:(NSUInteger)index];
 }
 
 @end