OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
| 5 #include "base/bind.h" |
| 6 #include "base/bind_helpers.h" |
5 #include "base/i18n/time_formatting.h" | 7 #include "base/i18n/time_formatting.h" |
6 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
7 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
8 #include "chrome/browser/certificate_viewer.h" | 10 #include "chrome/browser/certificate_viewer.h" |
9 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
10 #include "chrome/browser/ui/browser_dialogs.h" | 12 #include "chrome/browser/ui/browser_dialogs.h" |
11 #include "chrome/browser/ui/browser_list.h" | 13 #include "chrome/browser/ui/browser_list.h" |
12 #include "chrome/browser/ui/gtk/certificate_dialogs.h" | 14 #include "chrome/browser/ui/gtk/certificate_dialogs.h" |
13 #include "chrome/browser/ui/webui/certificate_viewer.h" | 15 #include "chrome/browser/ui/webui/certificate_viewer.h" |
14 #include "chrome/browser/ui/webui/chrome_web_ui.h" | 16 #include "chrome/browser/ui/webui/chrome_web_ui.h" |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 net::X509Certificate* cert) : cert_(cert), parent_(parent) { | 115 net::X509Certificate* cert) : cert_(cert), parent_(parent) { |
114 x509_certificate_model::GetCertChainFromCert(cert_->os_cert_handle(), | 116 x509_certificate_model::GetCertChainFromCert(cert_->os_cert_handle(), |
115 &cert_chain_); | 117 &cert_chain_); |
116 } | 118 } |
117 | 119 |
118 CertificateViewerDialogHandler::~CertificateViewerDialogHandler() { | 120 CertificateViewerDialogHandler::~CertificateViewerDialogHandler() { |
119 } | 121 } |
120 | 122 |
121 void CertificateViewerDialogHandler::RegisterMessages() { | 123 void CertificateViewerDialogHandler::RegisterMessages() { |
122 web_ui_->RegisterMessageCallback("exportCertificate", | 124 web_ui_->RegisterMessageCallback("exportCertificate", |
123 NewCallback(this, | 125 base::Bind(&CertificateViewerDialogHandler::ExportCertificate, |
124 &CertificateViewerDialogHandler::ExportCertificate)); | 126 base::Unretained(this))); |
125 web_ui_->RegisterMessageCallback("requestCertificateInfo", | 127 web_ui_->RegisterMessageCallback("requestCertificateInfo", |
126 NewCallback(this, | 128 base::Bind(&CertificateViewerDialogHandler::RequestCertificateInfo, |
127 &CertificateViewerDialogHandler::RequestCertificateInfo)); | 129 base::Unretained(this))); |
128 web_ui_->RegisterMessageCallback("requestCertificateFields", | 130 web_ui_->RegisterMessageCallback("requestCertificateFields", |
129 NewCallback(this, | 131 base::Bind(&CertificateViewerDialogHandler::RequestCertificateFields, |
130 &CertificateViewerDialogHandler::RequestCertificateFields)); | 132 base::Unretained(this))); |
131 } | 133 } |
132 | 134 |
133 void CertificateViewerDialogHandler::ExportCertificate( | 135 void CertificateViewerDialogHandler::ExportCertificate( |
134 const base::ListValue* args) { | 136 const base::ListValue* args) { |
135 int cert_index; | 137 int cert_index; |
136 double val; | 138 double val; |
137 if (!(args->GetDouble(0, &val))) | 139 if (!(args->GetDouble(0, &val))) |
138 return; | 140 return; |
139 cert_index = (int)val; | 141 cert_index = (int)val; |
140 if (cert_index < 0 || cert_index >= (int)cert_chain_.size()) | 142 if (cert_index < 0 || cert_index >= (int)cert_chain_.size()) |
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
389 cert_sub_fields->Append(node_details = new DictionaryValue()); | 391 cert_sub_fields->Append(node_details = new DictionaryValue()); |
390 node_details->SetString("label", | 392 node_details->SetString("label", |
391 l10n_util::GetStringUTF8(IDS_CERT_INFO_SHA1_FINGERPRINT_LABEL)); | 393 l10n_util::GetStringUTF8(IDS_CERT_INFO_SHA1_FINGERPRINT_LABEL)); |
392 node_details->SetString("payload.val", | 394 node_details->SetString("payload.val", |
393 x509_certificate_model::HashCertSHA1(cert)); | 395 x509_certificate_model::HashCertSHA1(cert)); |
394 | 396 |
395 // Send certificate information to javascript. | 397 // Send certificate information to javascript. |
396 web_ui_->CallJavascriptFunction("cert_viewer.getCertificateFields", | 398 web_ui_->CallJavascriptFunction("cert_viewer.getCertificateFields", |
397 root_list); | 399 root_list); |
398 } | 400 } |
OLD | NEW |