[Mac] Dismiss an open page info dialog when the location icon is clicked.

chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm

 // Copyright 2014 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 "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h"
 
 #import <AppKit/AppKit.h>
 
 #include <cmath>
 
@@ skipping 92 matching lines @@
 // Extra spacing after a headline on the Permissions tab.
 const CGFloat kPermissionsHeadlineSpacing = 2;
 
 // The amount of horizontal space between a permission label and the popup.
 const CGFloat kPermissionPopUpXSpacing = 3;
 
 // The amount of padding to *remove* when placing
 // |IDS_WEBSITE_SETTINGS_{FIRST,THIRD}_PARTY_SITE_DATA| next to each other.
 const CGFloat kTextLabelXPadding = 5;
 
+// NOTE: This assumes that there will never be more than one website settings
+// popup shown, and that the one that is shown is associated with the current
+// window. This matches the behaviour in views: see WebsiteSettingsPopupView.
+bool g_is_popup_showing = false;
+
 // Takes in the parent window, which should be a BrowserWindow, and gets the
 // proper anchor point for the bubble. The returned point is in screen
 // coordinates.
 NSPoint AnchorPointForWindow(NSWindow* parent) {
   BrowserWindowController* controller = [parent windowController];
   NSPoint origin = NSZeroPoint;
   if ([controller isKindOfClass:[BrowserWindowController class]]) {
     LocationBarViewMac* location_bar = [controller locationBarBridge];
     if (location_bar) {
       NSPoint bubble_point = location_bar->GetPageInfoBubblePoint();
@@ skipping 966 matching lines @@
       NSMakeSize(NSWidth([permissionsView_ frame]), controlOrigin.y)];
   [self performLayout];
 }
 
 @end
 
 WebsiteSettingsUIBridge::WebsiteSettingsUIBridge(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       web_contents_(web_contents),
-      bubble_controller_(nil) {}
+      bubble_controller_(nil) {
+  DCHECK(!g_is_popup_showing);
+  g_is_popup_showing = true;
+}
 
 WebsiteSettingsUIBridge::~WebsiteSettingsUIBridge() {
+  DCHECK(g_is_popup_showing);
+  g_is_popup_showing = false;
 }
 
 void WebsiteSettingsUIBridge::set_bubble_controller(
     WebsiteSettingsBubbleController* controller) {
   bubble_controller_ = controller;
 }
 
 void WebsiteSettingsUIBridge::Show(
     gfx::NativeWindow parent,
     Profile* profile,
     content::WebContents* web_contents,
     const GURL& virtual_url,
     const security_state::SecurityStateModel::SecurityInfo& security_info) {
   if (chrome::ToolkitViewsWebUIDialogsEnabled()) {
     chrome::ShowWebsiteSettingsBubbleViewsAtPoint(
         gfx::ScreenPointFromNSPoint(AnchorPointForWindow(parent)), profile,
         web_contents, virtual_url, security_info);
     return;
   }
 
+  // Don't show the popup if it's already being shown. Since this method is
+  // called each time the location icon is clicked, each click toggles the popup
+  // in and out.
+  if (g_is_popup_showing)
+    return;
+
   BubbleType bubble_type = WEB_PAGE;
   if (virtual_url.SchemeIs(content::kChromeUIScheme))
     bubble_type = INTERNAL_PAGE;
   else if (virtual_url.SchemeIs(extensions::kExtensionScheme))
     bubble_type = EXTENSION_PAGE;
 
   // Create the bridge. This will be owned by the bubble controller.
   WebsiteSettingsUIBridge* bridge = new WebsiteSettingsUIBridge(web_contents);
 
   bool is_devtools_disabled =
       profile->GetPrefs()->GetBoolean(prefs::kDevToolsDisabled);
 
-  // Create the bubble controller. It will dealloc itself when it closes.
+  // Create the bubble controller. It will dealloc itself when it closes,
+  // resetting |g_is_popup_showing|.
   WebsiteSettingsBubbleController* bubble_controller =
       [[WebsiteSettingsBubbleController alloc]
              initWithParentWindow:parent
           websiteSettingsUIBridge:bridge
                       webContents:web_contents
                        bubbleType:bubble_type
                isDevToolsDisabled:is_devtools_disabled];
 
   if (bubble_type == WEB_PAGE) {
     // Initialize the presenter, which holds the model and controls the UI.
@@ skipping 28 matching lines @@
 void WebsiteSettingsUIBridge::SetPermissionInfo(
     const PermissionInfoList& permission_info_list,
     const ChosenObjectInfoList& chosen_object_info_list) {
   [bubble_controller_ setPermissionInfo:permission_info_list
                        andChosenObjects:chosen_object_info_list];
 }
 
 void WebsiteSettingsUIBridge::SetSelectedTab(TabId tab_id) {
   // TODO(lgarron): Remove this from the interface. (crbug.com/571533)
 }