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

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

 // Copyright (c) 2012 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 "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
 
 #include <algorithm>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 34 matching lines @@
 #include "ui/views/controls/tabbed_pane/tabbed_pane.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_manager.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "url/gurl.h"
 
 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;
 const int kConnectionSectionPaddingTop = 16;
 const int kConnectionSectionPaddingRight = 18;
 
 // The text color that is used for the site identity status text, if the site's
 // identity was sucessfully verified.
 const int kIdentityVerifiedTextColor = 0xFF298a27;
 
@@ skipping 68 matching lines @@
 };
 
 // Website Settings are not supported for internal Chrome pages. Instead of the
 // |WebsiteSettingsPopupView|, the |InternalPageInfoPopupView| is
 // displayed.
 class InternalPageInfoPopupView : public views::BubbleDelegateView {
  public:
   explicit InternalPageInfoPopupView(views::View* anchor_view);
   virtual ~InternalPageInfoPopupView();
 
+  // views::BubbleDelegateView:
+  virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(InternalPageInfoPopupView);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // Popup Header
 ////////////////////////////////////////////////////////////////////////////////
 
 PopupHeaderView::PopupHeaderView(views::ButtonListener* close_button_listener)
     : name_(NULL), status_(NULL) {
@@ skipping 88 matching lines @@
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   AddChildView(label);
 
   views::BubbleDelegateView::CreateBubble(this)->Show();
   SizeToContents();
 }
 
 InternalPageInfoPopupView::~InternalPageInfoPopupView() {
 }
 
+void InternalPageInfoPopupView::OnWidgetDestroying(views::Widget* widget) {
+  is_popup_showing = false;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // WebsiteSettingsPopupView
 ////////////////////////////////////////////////////////////////////////////////
 
 WebsiteSettingsPopupView::~WebsiteSettingsPopupView() {
 }
 
 // static
 void WebsiteSettingsPopupView::ShowPopup(views::View* anchor_view,
                                          Profile* profile,
                                          content::WebContents* web_contents,
                                          const GURL& url,
                                          const content::SSLStatus& ssl,
                                          Browser* browser) {
+  is_popup_showing = true;
   if (InternalChromePage(url)) {
     new InternalPageInfoPopupView(anchor_view);
   } else {
     new WebsiteSettingsPopupView(anchor_view, profile, web_contents, url, ssl,
                                  browser);
   }
 }
 
+// static
+bool WebsiteSettingsPopupView::IsPopupShowing() {
+  return is_popup_showing;
+}
+
 WebsiteSettingsPopupView::WebsiteSettingsPopupView(
     views::View* anchor_view,
     Profile* profile,
     content::WebContents* web_contents,
     const GURL& url,
     const content::SSLStatus& ssl,
     Browser* browser)
     : BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_LEFT),
       web_contents_(web_contents),
       browser_(browser),
@@ skipping 65 matching lines @@
 }
 
 void WebsiteSettingsPopupView::OnPermissionChanged(
     PermissionSelectorView* permission_selector) {
   DCHECK(permission_selector);
   presenter_->OnSitePermissionChanged(permission_selector->type(),
                                       permission_selector->current_setting());
 }
 
 void WebsiteSettingsPopupView::OnWidgetDestroying(views::Widget* widget) {
+  is_popup_showing = false;
   presenter_->OnUIClosing();
 }
 
 void WebsiteSettingsPopupView::ButtonPressed(
     views::Button* button,
     const ui::Event& event) {
   GetWidget()->Close();
 }
 
 void WebsiteSettingsPopupView::LinkClicked(views::Link* source,
@@ skipping 415 matching lines @@
         web_contents_, signed_certificate_timestamp_ids_);
   } else if (source == help_center_link_) {
     browser_->OpenURL(content::OpenURLParams(
         GURL(chrome::kPageInfoHelpCenterURL),
         content::Referrer(),
         NEW_FOREGROUND_TAB,
         content::PAGE_TRANSITION_LINK,
         false));
   }
 }