Chromium Code Reviews| Index: chrome/browser/ui/webui/certificate_viewer.cc |
| diff --git a/chrome/browser/ui/webui/certificate_viewer.cc b/chrome/browser/ui/webui/certificate_viewer.cc |
| index 8e012ff749e54999c885764455fe19e6c5c6807a..d8d748aed20d384e2a05b589f3d5ade181ba3c8b 100644 |
| --- a/chrome/browser/ui/webui/certificate_viewer.cc |
| +++ b/chrome/browser/ui/webui/certificate_viewer.cc |
| @@ -51,13 +51,24 @@ void ShowCertificateViewer(gfx::NativeWindow parent, |
| void CertificateViewerDialog::ShowDialog(gfx::NativeWindow parent, |
| net::X509Certificate* cert) { |
| +#if defined(OS_CHROMEOS) |
| + CertificateViewerDialog* dialog = new CertificateViewerDialog(cert, |
| + chromeos::STYLE_CERT); |
| +#else |
| CertificateViewerDialog* dialog = new CertificateViewerDialog(cert); |
| +#endif |
| dialog->Show(parent); |
| } |
| +#if defined(OS_CHROMEOS) |
| +CertificateViewerDialog::CertificateViewerDialog(net::X509Certificate* cert, |
| + chromeos::BubbleWindowStyle style) |
| + : cert_(cert), window_(NULL), style_(style) { |
| +#else |
| CertificateViewerDialog::CertificateViewerDialog(net::X509Certificate* cert) |
| : cert_(cert), window_(NULL) { |
| - // Construct the dialog title from the certificate. |
| +#endif |
| +// Construct the dialog title from the certificate. |
| net::X509Certificate::OSCertHandles cert_chain; |
| x509_certificate_model::GetCertChainFromCert(cert_->os_cert_handle(), |
| &cert_chain); |
| @@ -71,7 +82,11 @@ CertificateViewerDialog::~CertificateViewerDialog() { |
| void CertificateViewerDialog::Show(gfx::NativeWindow parent) { |
| Browser* browser = BrowserList::GetLastActive(); |
| DCHECK(browser); |
| +#if defined(OS_CHROMEOS) |
| + window_ = browser->BrowserShowHtmlDialog(this, parent, style_); |
|
flackr
2011/11/10 16:03:16
Assuming the rename I suggested earlier and using
bshe
2011/11/21 16:09:37
Done.
|
| +#else |
| window_ = browser->BrowserShowHtmlDialog(this, parent); |
| +#endif |
| } |
| bool CertificateViewerDialog::IsDialogModal() const { |