Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / toolbar / toolbar_model_impl.cc

diff --git a/src/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/src/chrome/browser/ui/toolbar/toolbar_model_impl.cc
index 1244022..f0de3dc 100644 (file)
--- a/src/chrome/browser/ui/toolbar/toolbar_model_impl.cc
+++ b/src/chrome/browser/ui/toolbar/toolbar_model_impl.cc
@@ -164,8 +164,10 @@ bool ToolbarModelImpl::WouldOmitURLDueToOriginChip() const {
     }
   }
 
-  return chrome::ShouldDisplayOriginChip() && ShouldDisplayURL() &&
-      url_replacement_enabled();
+  bool should_display_origin_chip =
+      chrome::ShouldDisplayOriginChip() || chrome::ShouldDisplayOriginChipV2();
+  return should_display_origin_chip && delegate_->InTabbedBrowser() &&
+      ShouldDisplayURL() && url_replacement_enabled();
 }
 
 bool ToolbarModelImpl::WouldPerformSearchTermReplacement(
@@ -191,9 +193,9 @@ bool ToolbarModelImpl::ShouldDisplayURL() const {
 
     GURL url = entry->GetURL();
     GURL virtual_url = entry->GetVirtualURL();
-    if (url.SchemeIs(chrome::kChromeUIScheme) ||
-        virtual_url.SchemeIs(chrome::kChromeUIScheme)) {
-      if (!url.SchemeIs(chrome::kChromeUIScheme))
+    if (url.SchemeIs(content::kChromeUIScheme) ||
+        virtual_url.SchemeIs(content::kChromeUIScheme)) {
+      if (!url.SchemeIs(content::kChromeUIScheme))
         url = virtual_url;
       return url.host() != chrome::kChromeUINewTabHost;
     }
@@ -219,8 +221,8 @@ int ToolbarModelImpl::GetIcon() const {
             IDR_OMNIBOX_SEARCH_SECURED : IDR_OMNIBOX_SEARCH;
   }
 
-  // When the site chip experiment is running, the icon in the location bar,
-  // when not the search icon, should be the page icon.
+  // When the original site chip experiment is running, the icon in the location
+  // bar, when not the search icon, should be the page icon.
   if (chrome::ShouldDisplayOriginChip())
     return GetIconForSecurityLevel(NONE);