diff options
Diffstat (limited to 'chrome/browser/ssl')
| -rw-r--r-- | chrome/browser/ssl/ssl_blocking_page.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_browser_tests.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_error_info.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_tab_helper.cc | 9 |
4 files changed, 10 insertions, 3 deletions
diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc index 1e5d9c8..572ae94 100644 --- a/chrome/browser/ssl/ssl_blocking_page.cc +++ b/chrome/browser/ssl/ssl_blocking_page.cc @@ -41,6 +41,7 @@ #include "base/win/windows_version.h" #endif +using base::ASCIIToUTF16; using base::TimeTicks; using content::InterstitialPage; using content::NavigationController; diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index e1b2d01..bcf8cf1 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -48,6 +48,7 @@ #include "net/cert/nss_cert_database.h" #endif // defined(USE_NSS) +using base::ASCIIToUTF16; using content::InterstitialPage; using content::NavigationController; using content::NavigationEntry; diff --git a/chrome/browser/ssl/ssl_error_info.cc b/chrome/browser/ssl/ssl_error_info.cc index 3dae1d2..4a9060a 100644 --- a/chrome/browser/ssl/ssl_error_info.cc +++ b/chrome/browser/ssl/ssl_error_info.cc @@ -16,6 +16,8 @@ #include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" +using base::UTF8ToUTF16; + SSLErrorInfo::SSLErrorInfo(const base::string16& title, const base::string16& details, const base::string16& short_description, diff --git a/chrome/browser/ssl/ssl_tab_helper.cc b/chrome/browser/ssl/ssl_tab_helper.cc index 5aec77c..51612f4 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); } |