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

chrome/browser/ui/views/browser_dialogs_views_mac.cc

 // Copyright 2015 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.
 
 #include <utility>
 
 #include "chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h"
 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"
 #include "chrome/browser/ui/views/new_task_manager_view.h"
 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
 
 // This file provides definitions of desktop browser dialog-creation methods for
 // Mac where a Cocoa browser is using Views dialogs. I.e. it is included in the
 // Cocoa build and definitions under chrome/browser/ui/cocoa may select at
 // runtime whether to show a Cocoa dialog, or the toolkit-views dialog defined
 // here (declared in browser_dialogs.h).
 
 namespace chrome {
 
 void ShowWebsiteSettingsBubbleViewsAtPoint(
     const gfx::Point& anchor_point,
     Profile* profile,
     content::WebContents* web_contents,
     const GURL& virtual_url,
     const security_state::SecurityStateModel::SecurityInfo& security_info) {
+  // Don't show the bubble again if it's already showing. A second click on the
+  // location icon in the omnibox will dismiss an open bubble. This behaviour is
+  // consistent with the non-Mac views implementation.
+  // This must be checked explicitly on views platforms because the bubble is

[tapted, 2016/06/08 06:54:57]

'views platforms' is a confusing concept now :). Perhaps something like

Note that when the browser is toolkit-views, IsPopupShowing() is checked earlier
because the popup is shown on mouse release (but dismissed on mouse pressed). A
Cocoa browser does both on mouse pressed, so a check when showing is sufficient.

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

Done.

+  // triggered on mouse release, which is too late to stop the original bubble
+  // from being dismissed and IsPopupShowing from being reset. On Mac, this
+  // method is called on mouse press, before the bubble deallocates and resets.
+  if (WebsiteSettingsPopupView::IsPopupShowing())
+    return;
+
   WebsiteSettingsPopupView::ShowPopup(
       nullptr, gfx::Rect(anchor_point, gfx::Size()), profile, web_contents,
       virtual_url, security_info);
 }
 
 void ShowBookmarkBubbleViewsAtPoint(const gfx::Point& anchor_point,
                                     gfx::NativeView parent,
                                     bookmarks::BookmarkBubbleObserver* observer,
                                     Browser* browser,
                                     const GURL& virtual_url,
@@ skipping 24 matching lines @@
                                            const gfx::Point& anchor) {
   ContentSettingBubbleContents* contents =
       new ContentSettingBubbleContents(model, web_contents, nullptr,
           views::BubbleBorder::Arrow::TOP_RIGHT);
   contents->set_parent_window(parent_view);
   contents->SetAnchorRect(gfx::Rect(anchor, gfx::Size()));
   views::BubbleDialogDelegateView::CreateBubble(contents)->Show();
 }
 
 }  // namespace chrome