Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Unified Diff: chrome/browser/ui/views/toolbar/site_chip_view.cc

Issue 114883004: Add base:: namespace to straggling string16s left in chrome/browser/ui. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: found more Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/toolbar/site_chip_view.h ('k') | chrome/browser/ui/webui/history_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(),
« no previous file with comments | « chrome/browser/ui/views/toolbar/site_chip_view.h ('k') | chrome/browser/ui/webui/history_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698