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

Unified Diff: chrome/browser/ssl/ssl_tab_helper.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/ssl/ssl_tab_helper.cc
diff --git a/chrome/browser/ssl/ssl_tab_helper.cc b/chrome/browser/ssl/ssl_tab_helper.cc
index 5aec77cdb9e5778e86e2100358e1747d814742c9..51612f4517a21557704f87f2027b471c0673fd3c 100644
--- a/chrome/browser/ssl/ssl_tab_helper.cc
+++ b/chrome/browser/ssl/ssl_tab_helper.cc
@@ -219,7 +219,8 @@ void SSLTabHelper::OnVerifyClientCertificateError(
GetAddCertData(handler.get())->ShowInfoBar(
l10n_util::GetStringFUTF16(IDS_ADD_CERT_ERR_INVALID_CERT,
base::IntToString16(-error_code),
- ASCIIToUTF16(net::ErrorToString(error_code))),
+ base::ASCIIToUTF16(
+ net::ErrorToString(error_code))),
NULL);
}
@@ -234,7 +235,8 @@ void SSLTabHelper::OnAddClientCertificateSuccess(
// TODO(evanm): GetDisplayName should return UTF-16.
GetAddCertData(handler.get())->ShowInfoBar(
l10n_util::GetStringFUTF16(IDS_ADD_CERT_SUCCESS_INFOBAR_LABEL,
- UTF8ToUTF16(cert->issuer().GetDisplayName())),
+ base::UTF8ToUTF16(
+ cert->issuer().GetDisplayName())),
cert);
}
@@ -245,7 +247,8 @@ void SSLTabHelper::OnAddClientCertificateError(
GetAddCertData(handler.get())->ShowInfoBar(
l10n_util::GetStringFUTF16(IDS_ADD_CERT_ERR_FAILED,
base::IntToString16(-error_code),
- ASCIIToUTF16(net::ErrorToString(error_code))),
+ base::ASCIIToUTF16(
+ net::ErrorToString(error_code))),
NULL);
}
« no previous file with comments | « chrome/browser/ssl/ssl_error_info.cc ('k') | chrome/browser/status_icons/status_icon_menu_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698