[OriginChip] Show the page info bubble on the location bar icon.

chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

Index: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
index 4d6e5e6a4de26be8a560a8684f5162f93d4a1c61..87c4ed5cfcccce7a0d02cd18280712cd2d567146 100644
--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
+++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
@@ -52,6 +52,8 @@
 
 namespace {
 
+bool is_popup_showing = false;

[Peter Kasting, 2014/03/18 01:23:13]

Using a process-wide variable for this makes me nervous.  This means that if we
have two windows, and one is showing the popup, and the other window's omnibox
calls IsPopupShowing(), it will return true.  That seems wrong, though I'm not
sure in your current patch it will cause problems.  (Maybe.  You could test the
following: click the origin chip in window A, then click the location icon in
window B and see if the origin chip in A re-appears.)

I would prefer this be scoped to the window.

[Justin Donnelly, 2014/03/18 15:54:48]

This works because the omnibox in window A loses focus and re-shows the chip
before window B opens the info popup.
SGTM, but it's not clear to me how to go about doing this effectively.  The
settings popup has a reference to an anchor view (the location icon, in this
case) but the there's no reference from the window or anything in it to the
settings popup.  This class could keep a static map between the anchor views and
the popups but that seems like overkill given that it wouldn't currently have
any visible effect.

Thoughts?  Did you have something else in mind?

+
 // Padding values for sections on the connection tab.
 const int kConnectionSectionPaddingBottom = 16;
 const int kConnectionSectionPaddingLeft = 18;
@@ -140,6 +142,9 @@ class InternalPageInfoPopupView : public views::BubbleDelegateView {
   explicit InternalPageInfoPopupView(views::View* anchor_view);
   virtual ~InternalPageInfoPopupView();
 
+  // views::BubbleDelegateView:
+  virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(InternalPageInfoPopupView);
 };
@@ -248,6 +253,10 @@ InternalPageInfoPopupView::InternalPageInfoPopupView(views::View* anchor_view)
 InternalPageInfoPopupView::~InternalPageInfoPopupView() {
 }
 
+void InternalPageInfoPopupView::OnWidgetDestroying(views::Widget* widget) {
+  is_popup_showing = false;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // WebsiteSettingsPopupView
 ////////////////////////////////////////////////////////////////////////////////
@@ -262,6 +271,7 @@ void WebsiteSettingsPopupView::ShowPopup(views::View* anchor_view,
                                          const GURL& url,
                                          const content::SSLStatus& ssl,
                                          Browser* browser) {
+  is_popup_showing = true;
   if (InternalChromePage(url)) {
     new InternalPageInfoPopupView(anchor_view);
   } else {
@@ -270,6 +280,11 @@ void WebsiteSettingsPopupView::ShowPopup(views::View* anchor_view,
   }
 }
 
+// static
+bool WebsiteSettingsPopupView::IsPopupShowing() {
+  return is_popup_showing;
+}
+
 WebsiteSettingsPopupView::WebsiteSettingsPopupView(
     views::View* anchor_view,
     Profile* profile,
@@ -355,6 +370,7 @@ void WebsiteSettingsPopupView::OnPermissionChanged(
 }
 
 void WebsiteSettingsPopupView::OnWidgetDestroying(views::Widget* widget) {
+  is_popup_showing = false;
   presenter_->OnUIClosing();
 }