diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-11 20:53:37 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-16 13:54:48 +0100 |
| commit | 21d179b334e59e9a3bfcaed4c4430bef1bc5759d (patch) | |
| tree | 64e2bb6da27af6a5c93ca34f6051584aafbfcb9e /chrome/browser/gtk/ssl_client_certificate_selector.cc | |
| parent | 0c63f00edd6ed0482fd5cbcea937ca088baf7858 (diff) | |
| download | external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.zip external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.gz external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.bz2 | |
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
Diffstat (limited to 'chrome/browser/gtk/ssl_client_certificate_selector.cc')
| -rw-r--r-- | chrome/browser/gtk/ssl_client_certificate_selector.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/gtk/ssl_client_certificate_selector.cc b/chrome/browser/gtk/ssl_client_certificate_selector.cc index 8e4077e..edf560a 100644 --- a/chrome/browser/gtk/ssl_client_certificate_selector.cc +++ b/chrome/browser/gtk/ssl_client_certificate_selector.cc @@ -246,7 +246,7 @@ std::string SSLClientCertificateSelector::FormatDetailsText( rv += l10n_util::GetStringFUTF8( IDS_CERT_SUBJECTNAME_FORMAT, - UTF8ToUTF16(x509_certificate_model::GetSubjectName(cert)));; + UTF8ToUTF16(x509_certificate_model::GetSubjectName(cert))); rv += "\n "; rv += l10n_util::GetStringFUTF8( @@ -256,10 +256,8 @@ std::string SSLClientCertificateSelector::FormatDetailsText( base::Time issued, expires; if (x509_certificate_model::GetTimes(cert, &issued, &expires)) { - string16 issued_str = WideToUTF16( - base::TimeFormatShortDateAndTime(issued)); - string16 expires_str = WideToUTF16( - base::TimeFormatShortDateAndTime(expires)); + string16 issued_str = base::TimeFormatShortDateAndTime(issued); + string16 expires_str = base::TimeFormatShortDateAndTime(expires); rv += "\n "; rv += l10n_util::GetStringFUTF8(IDS_CERT_VALIDITY_RANGE_FORMAT, issued_str, expires_str); |