diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 15:32:34 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 15:32:34 +0000 |
| commit | f80d8119d15f8c5e48faf6fde2261376008b4e92 (patch) | |
| tree | 27f976759b4642b2990dfcdd89b276b2021b04cd /chrome | |
| parent | 90f8e2168bc12e74f37dc82ea78a2309c6cb53cc (diff) | |
| download | chromium_src-f80d8119d15f8c5e48faf6fde2261376008b4e92.zip chromium_src-f80d8119d15f8c5e48faf6fde2261376008b4e92.tar.gz chromium_src-f80d8119d15f8c5e48faf6fde2261376008b4e92.tar.bz2 | |
Rmeove another wstring from infobar code.
Spotted in previous review.
BUG=23581
Review URL: http://codereview.chromium.org/3152019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents_ssl_helper.cc | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc index 2dde79e..685b6e1 100644 --- a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc +++ b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc @@ -114,12 +114,9 @@ class TabContentsSSLHelper::SSLAddCertData : public NotificationObserver { infobar_delegate_ = delegate; } - void ShowErrorInfoBar(const std::wstring& message) { + void ShowErrorInfoBar(const string16& message) { ShowInfoBar( - new SimpleAlertInfoBarDelegate(tab_, - WideToUTF16(message), - GetCertIcon(), - true)); + new SimpleAlertInfoBarDelegate(tab_, message, GetCertIcon(), true)); } // NotificationObserver implementation. @@ -178,9 +175,9 @@ void TabContentsSSLHelper::OnVerifyClientCertificateError( // Display an infobar with the error message. // TODO(davidben): Display a more user-friendly error string. add_cert_data->ShowErrorInfoBar( - l10n_util::GetStringF(IDS_ADD_CERT_ERR_INVALID_CERT, - UTF8ToWide(base::IntToString(-error_code)), - ASCIIToWide(net::ErrorToString(error_code)))); + l10n_util::GetStringFUTF16(IDS_ADD_CERT_ERR_INVALID_CERT, + base::IntToString16(-error_code), + ASCIIToUTF16(net::ErrorToString(error_code)))); } void TabContentsSSLHelper::AskToAddClientCertificate( @@ -202,9 +199,9 @@ void TabContentsSSLHelper::OnAddClientCertificateError( // Display an infobar with the error message. // TODO(davidben): Display a more user-friendly error string. add_cert_data->ShowErrorInfoBar( - l10n_util::GetStringF(IDS_ADD_CERT_ERR_FAILED, - UTF8ToWide(base::IntToString(-error_code)), - ASCIIToWide(net::ErrorToString(error_code)))); + l10n_util::GetStringFUTF16(IDS_ADD_CERT_ERR_FAILED, + base::IntToString16(-error_code), + ASCIIToUTF16(net::ErrorToString(error_code)))); } void TabContentsSSLHelper::OnAddClientCertificateFinished( |