[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() &&
       !model()->user_input_in_progress()) {
     controller()->GetToolbarModel()->set_origin_chip_enabled(true);
     controller()->GetToolbarModel()->set_url_replacement_enabled(true);