Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / location_bar / page_info_helper.cc

diff --git a/src/chrome/browser/ui/views/location_bar/page_info_helper.cc b/src/chrome/browser/ui/views/location_bar/page_info_helper.cc
index 4839122..98c596a 100644 (file)
--- a/src/chrome/browser/ui/views/location_bar/page_info_helper.cc
+++ b/src/chrome/browser/ui/views/location_bar/page_info_helper.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/views/location_bar/page_info_helper.h"
 
+#include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "content/public/browser/navigation_controller.h"
@@ -27,7 +28,9 @@ void PageInfoHelper::ProcessEvent(const ui::LocatedEvent& event) {
 
   // Do not show page info if the user has been editing the location
   // bar, or the location bar is at the NTP.
-  if (location_bar_->GetLocationEntry()->IsEditingOrEmpty())
+  if (location_bar_->GetOmniboxView()->IsEditingOrEmpty() &&
+      !chrome::ShouldDisplayOriginChip() &&
+      !chrome::ShouldDisplayOriginChipV2())
     return;
 
   WebContents* tab = location_bar_->GetWebContents();