[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 41 matching lines @@
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 #include "ui/resources/grit/ui_resources.h"
 
 using ChosenObjectInfoPtr =
     std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo>;
 using ChosenObjectDeleteCallback =
     base::Callback<void(const WebsiteSettingsUI::ChosenObjectInfo&)>;
 
 namespace {
 
+// 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 is_popup_showing = false;

[tapted, 2016/06/06 05:06:37]

g_is_popup_showing. Also move down to the end of the namespace - constants come
first in a scope.

[dominickn, 2016/06/08 03:03:08]

Done.

+
 // The default width of the window, in view coordinates. It may be larger to
 // fit the content.
 const CGFloat kDefaultWindowWidth = 310;
 
 // Padding between the window frame and content.
 const CGFloat kFramePadding = 20;
 
 // Padding between the window frame and content.
 const CGFloat kVerticalSectionMargin = 16;
 
@@ skipping 151 matching lines @@
     bridge_.reset(bridge);
     bridge_->set_bubble_controller(self);
   }
   return self;
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
   if (presenter_.get())
     presenter_->OnUIClosing();
   presenter_.reset();
+  is_popup_showing = false;
   [super windowWillClose:notification];
 }
 
 - (void)setPresenter:(WebsiteSettings*)presenter {
   presenter_.reset(presenter);
 }
 
 // Create the subviews for the bubble for internal Chrome pages.
 - (void)initializeContentsForInternalPage:(BOOL)isExtensionPage {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
@@ skipping 849 matching lines @@
 
 @end
 
 WebsiteSettingsUIBridge::WebsiteSettingsUIBridge(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       web_contents_(web_contents),
       bubble_controller_(nil) {}
 
 WebsiteSettingsUIBridge::~WebsiteSettingsUIBridge() {
+  is_popup_showing = false;

[tapted, 2016/06/06 05:06:37]

why is this needed twice? Can we just tie the lifetime to
WebsiteSettingsUIBridge? and only set = true in the constructor? (after
DCHECKing that it is currently false?)

[dominickn, 2016/06/08 03:03:08]

Done.

 }
 
 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;
   }
 
+  // If the WebsiteSettings are already being shown, don't show them again.
+  // This effectively means that clicking on the location icon when
+  // WebsiteSettings is already visible dismisses the open popup, destroying
+  // this object and setting |is_popup_showing| to false.
+  if (is_popup_showing)
+    return;
+
+  is_popup_showing = true;
   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 =
@@ skipping 41 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)
 }