| Index: chrome/browser/ui/gtk/certificate_viewer.cc
|
| ===================================================================
|
| --- chrome/browser/ui/gtk/certificate_viewer.cc (revision 80507)
|
| +++ chrome/browser/ui/gtk/certificate_viewer.cc (working copy)
|
| @@ -44,9 +44,11 @@
|
| gtk_util::IndentWidget(
|
| gtk_util::LeftAlignMisc(gtk_label_new(text.c_str()))),
|
| 0, 1, row, row + 1);
|
| + GtkWidget* label = gtk_label_new(value.c_str());
|
| + gtk_label_set_selectable(GTK_LABEL(label), TRUE);
|
| gtk_table_attach_defaults(
|
| table,
|
| - gtk_util::LeftAlignMisc(gtk_label_new(value.c_str())),
|
| + gtk_util::LeftAlignMisc(label),
|
| 1, 2, row, row + 1);
|
| }
|
|
|
| @@ -177,7 +179,7 @@
|
| }
|
|
|
| CertificateViewer::~CertificateViewer() {
|
| - x509_certificate_model::DestroyCertChain(&cert_chain_list_);
|
| + net::X509Certificate::DestroyCertChain(&cert_chain_list_);
|
| }
|
|
|
| void CertificateViewer::InitGeneralPage() {
|
| @@ -485,6 +487,32 @@
|
| FIELDS_VALUE,
|
| x509_certificate_model::ProcessRawBitsSignatureWrap(cert).c_str(),
|
| -1);
|
| +
|
| + GtkTreeIter top_fingerprints_iter;
|
| + gtk_tree_store_append(store, &top_fingerprints_iter, &top);
|
| + gtk_tree_store_set(
|
| + store, &top_fingerprints_iter,
|
| + FIELDS_NAME,
|
| + l10n_util::GetStringUTF8(IDS_CERT_INFO_FINGERPRINTS_GROUP).c_str(),
|
| + FIELDS_VALUE, "",
|
| + -1);
|
| +
|
| + GtkTreeIter fingerprints_iter;
|
| + gtk_tree_store_append(store, &fingerprints_iter, &top_fingerprints_iter);
|
| + gtk_tree_store_set(
|
| + store, &fingerprints_iter,
|
| + FIELDS_NAME,
|
| + l10n_util::GetStringUTF8(IDS_CERT_INFO_SHA256_FINGERPRINT_LABEL).c_str(),
|
| + FIELDS_VALUE, x509_certificate_model::HashCertSHA256(cert).c_str(),
|
| + -1);
|
| +
|
| + gtk_tree_store_append(store, &fingerprints_iter, &top_fingerprints_iter);
|
| + gtk_tree_store_set(
|
| + store, &fingerprints_iter,
|
| + FIELDS_NAME,
|
| + l10n_util::GetStringUTF8(IDS_CERT_INFO_SHA1_FINGERPRINT_LABEL).c_str(),
|
| + FIELDS_VALUE, x509_certificate_model::HashCertSHA1(cert).c_str(),
|
| + -1);
|
| }
|
|
|
| // static
|
| @@ -683,7 +711,7 @@
|
| void ShowCertificateViewer(gfx::NativeWindow parent,
|
| net::X509Certificate::OSCertHandle cert) {
|
| net::X509Certificate::OSCertHandles cert_chain;
|
| - x509_certificate_model::GetCertChainFromCert(cert, &cert_chain);
|
| + net::X509Certificate::GetCertChainFromCert(cert, &cert_chain);
|
| (new CertificateViewer(parent, cert_chain))->Show();
|
| }
|
|
|
|
|