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

Unified Diff: chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

Issue 120983002: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index 2062dd2f3419454a34117d54742df74a2fb88e86..ed6c95199f9419474ede759fc6d04ec9c7e3f5e9 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -931,7 +931,7 @@ void SafeBrowsingBlockingPageV1::PopulateMultipleThreatStringDictionary(
l10n_util::GetStringUTF16(IDS_SAFE_BROWSING_MALWARE_HEADLINE),
l10n_util::GetStringFUTF16(
IDS_SAFE_BROWSING_MULTI_THREAT_DESCRIPTION1,
- UTF8ToUTF16(web_contents_->GetURL().host())),
+ base::UTF8ToUTF16(web_contents_->GetURL().host())),
l10n_util::GetStringUTF16(
IDS_SAFE_BROWSING_MULTI_THREAT_DESCRIPTION2),
base::string16());
@@ -943,7 +943,7 @@ void SafeBrowsingBlockingPageV1::PopulateMultipleThreatStringDictionary(
l10n_util::GetStringUTF16(IDS_SAFE_BROWSING_MALWARE_HEADLINE),
l10n_util::GetStringFUTF16(
IDS_SAFE_BROWSING_MULTI_MALWARE_DESCRIPTION1,
- UTF8ToUTF16(web_contents_->GetURL().host())),
+ base::UTF8ToUTF16(web_contents_->GetURL().host())),
l10n_util::GetStringUTF16(
IDS_SAFE_BROWSING_MULTI_MALWARE_DESCRIPTION2),
l10n_util::GetStringUTF16(
@@ -956,7 +956,7 @@ void SafeBrowsingBlockingPageV1::PopulateMultipleThreatStringDictionary(
l10n_util::GetStringUTF16(IDS_SAFE_BROWSING_PHISHING_HEADLINE),
l10n_util::GetStringFUTF16(
IDS_SAFE_BROWSING_MULTI_PHISHING_DESCRIPTION1,
- UTF8ToUTF16(web_contents_->GetURL().host())),
+ base::UTF8ToUTF16(web_contents_->GetURL().host())),
base::string16(),
base::string16());
break;
@@ -1109,7 +1109,7 @@ void SafeBrowsingBlockingPageV2::PopulateMalwareStringDictionary(
description1 = l10n_util::GetStringFUTF16(
IDS_SAFE_BROWSING_MALWARE_V2_DESCRIPTION1,
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
- UTF8ToUTF16(url_.host()));
+ base::UTF8ToUTF16(url_.host()));
description2 = l10n_util::GetStringUTF16(
IDS_SAFE_BROWSING_MALWARE_V2_DESCRIPTION2);
strings->SetString("details", l10n_util::GetStringUTF16(
@@ -1120,13 +1120,13 @@ void SafeBrowsingBlockingPageV2::PopulateMalwareStringDictionary(
description1 = l10n_util::GetStringFUTF16(
IDS_SAFE_BROWSING_MALWARE_V2_DESCRIPTION1_SUBRESOURCE,
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
- UTF8ToUTF16(web_contents_->GetURL().host()));
+ base::UTF8ToUTF16(web_contents_->GetURL().host()));
description2 = l10n_util::GetStringFUTF16(
IDS_SAFE_BROWSING_MALWARE_V2_DESCRIPTION2_SUBRESOURCE,
- UTF8ToUTF16(url_.host()));
+ base::UTF8ToUTF16(url_.host()));
strings->SetString("details", l10n_util::GetStringFUTF16(
IDS_SAFE_BROWSING_MALWARE_V2_DETAILS_SUBRESOURCE,
- UTF8ToUTF16(url_.host())));
+ base::UTF8ToUTF16(url_.host())));
}
PopulateStringDictionary(
@@ -1153,7 +1153,7 @@ void SafeBrowsingBlockingPageV2::PopulateMalwareStringDictionary(
strings->SetString("confirm_text",
l10n_util::GetStringFUTF16(
IDS_SAFE_BROWSING_MALWARE_V2_REPORTING_AGREE,
- UTF8ToUTF16(privacy_link)));
+ base::UTF8ToUTF16(privacy_link)));
if (IsPrefEnabled(prefs::kSafeBrowsingReportingEnabled))
strings->SetString(kBoxChecked, "yes");
else
@@ -1173,7 +1173,7 @@ void SafeBrowsingBlockingPageV2::PopulatePhishingStringDictionary(
l10n_util::GetStringUTF16(IDS_SAFE_BROWSING_PHISHING_V2_HEADLINE),
l10n_util::GetStringFUTF16(IDS_SAFE_BROWSING_PHISHING_V2_DESCRIPTION1,
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
- UTF8ToUTF16(url_.host())),
+ base::UTF8ToUTF16(url_.host())),
base::string16(),
l10n_util::GetStringUTF16(IDS_SAFE_BROWSING_PHISHING_V2_DESCRIPTION2));
« no previous file with comments | « chrome/browser/rlz/rlz_unittest.cc ('k') | chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698