}
}
- 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(
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;
}
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);