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/certificate_viewer.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/certificate_viewer.cc')
| -rw-r--r-- | chrome/browser/gtk/certificate_viewer.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/gtk/certificate_viewer.cc b/chrome/browser/gtk/certificate_viewer.cc index 905eee3..a79507d 100644 --- a/chrome/browser/gtk/certificate_viewer.cc +++ b/chrome/browser/gtk/certificate_viewer.cc @@ -260,9 +260,9 @@ void CertificateViewer::InitGeneralPage() { base::Time issued, expires; std::string issued_str, expires_str; if (x509_certificate_model::GetTimes(cert, &issued, &expires)) { - issued_str = WideToUTF8( + issued_str = UTF16ToUTF8( base::TimeFormatShortDateNumeric(issued)); - expires_str = WideToUTF8( + expires_str = UTF16ToUTF8( base::TimeFormatShortDateNumeric(expires)); } else { issued_str = alternative_text; @@ -389,8 +389,8 @@ void CertificateViewer::FillTreeStoreWithCertFields( base::Time issued, expires; std::string issued_str, expires_str; if (x509_certificate_model::GetTimes(cert, &issued, &expires)) { - issued_str = WideToUTF8(base::TimeFormatShortDateAndTime(issued)); - expires_str = WideToUTF8(base::TimeFormatShortDateAndTime(expires)); + issued_str = UTF16ToUTF8(base::TimeFormatShortDateAndTime(issued)); + expires_str = UTF16ToUTF8(base::TimeFormatShortDateAndTime(expires)); } gtk_tree_store_append(store, &iter, &validity_iter); gtk_tree_store_set( |