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

chrome/browser/ui/views/omnibox/omnibox_view_views.cc

Index: chrome/browser/ui/views/omnibox/omnibox_view_views.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index 7ba9f7437059fcea26d70ecfb24b0287c86d79a2..76352f1428624859a2f00dfb40cbb1a23b5830c5 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -21,6 +21,7 @@
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h"
+#include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/constants.h"
@@ -417,12 +418,14 @@ void OmniboxViewViews::OnBlur() {
   // Tell the model to reset itself.
   model()->OnKillFocus();
 
-  // If user input is not in progress, re-enable the origin chip and URL
-  // replacement.  This addresses the case where the URL was shown by a call
-  // to ShowURL().  If the Omnibox achieved focus by other means, the calls to
-  // set_url_replacement_enabled, UpdatePermanentText and RevertAll are not
-  // required (a call to OnChanged would be sufficient) but do no harm.
+  // If user input is not in progress and the website settings popup is not
+  // being shown, re-enable the origin chip and URL replacement.  This addresses
+  // the case where the URL was shown by a call to ShowURL().  If the Omnibox
+  // achieved focus by other means, the calls to set_url_replacement_enabled,
+  // UpdatePermanentText and RevertAll are not required (a call to OnChanged
+  // would be sufficient) but do no harm.
   if (chrome::ShouldDisplayOriginChipV2() &&
+      !WebsiteSettingsPopupView::IsPopupShowing() &&

[Peter Kasting, 2014/03/12 21:11:27]

Adding this worries me because I'm concerned the origin chip won't automatically
reappear when the website settings popup disappears.

Why is this necessary anyway?  How can the website settings popup be showing if
the omnibox has focus and the origin chip is hidden?

[Justin Donnelly, 2014/03/14 15:27:51]

The way this behaves (tested in Linux, CrOS and Windows) is that when the popup
is closed (either by click on the x, hitting esc, or clicking anywhere outside
the popup), focus reverts to the Omnibox.  Then the normal focus loss to reshow
the chip can proceed as before.

But I hear you that it hardly seems guaranteed that focus will always and
forever revert to the omnibox.  Other approaches I considered seemed more
complex and still potentially flakey.  Suggestions?
The point of this CL is to allow clicking on the location icon in the omnibox to
show the website settings after the origin chip is hidden by clicking on it.

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

What if we just left this line out?  If you've hidden the chip, but user input
isn't in progress, and you click the location icon, we revert back to showing
the chip (and show the popup window).

I dunno, maybe that feels lame.  If so, I can't think of anything better than
what you're doing here.

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

Yeah, I initially tried this.  It's not horrible, but it does feel a little
lame.

       !model()->user_input_in_progress()) {
     controller()->GetToolbarModel()->set_origin_chip_enabled(true);
     controller()->GetToolbarModel()->set_url_replacement_enabled(true);