Index: chrome/browser/ui/views/toolbar/site_chip_view.cc |
diff --git a/chrome/browser/ui/views/toolbar/site_chip_view.cc b/chrome/browser/ui/views/toolbar/site_chip_view.cc |
index b0e028aec7811ce796cd884b5e5f83dffe0acea2..ad4623fca0271e53642bb25ca4d2c3cc34457ca4 100644 |
--- a/chrome/browser/ui/views/toolbar/site_chip_view.cc |
+++ b/chrome/browser/ui/views/toolbar/site_chip_view.cc |
@@ -172,7 +172,7 @@ int StringForChromeHost(const GURL& url) { |
} // namespace |
-string16 SiteChipView::SiteLabelFromURL(const GURL& provided_url) { |
+base::string16 SiteChipView::SiteLabelFromURL(const GURL& provided_url) { |
// First, strip view-source: if it appears. Note that GetContent removes |
// "view-source:" but leaves the http, https or ftp scheme. |
GURL url(provided_url); |
@@ -349,7 +349,7 @@ void SiteChipView::Update(content::WebContents* web_contents) { |
painter_ = NULL; |
} |
- string16 host = SiteLabelFromURL(url_displayed_); |
+ base::string16 host = SiteLabelFromURL(url_displayed_); |
if (security_level_ == ToolbarModel::EV_SECURE) { |
host = l10n_util::GetStringFUTF16(IDS_SITE_CHIP_EV_SSL_LABEL, |
toolbar_view_->GetToolbarModel()->GetEVCertName(), |