UI polish for certificate viewer

chrome/browser/ui/webui/certificate_viewer.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/time_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
@@ skipping 33 matching lines @@
   else
     ShowNativeCertificateViewer(parent, cert);
 #endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CertificateViewerDialog
 
 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);
   title_ = l10n_util::GetStringFUTF16(IDS_CERT_INFO_DIALOG_TITLE,
       UTF8ToUTF16(x509_certificate_model::GetTitle(cert_chain.front())));
 }
 
 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 the existing style to toggle
the close button, this would be STYLE_XBAR | STYLE_FLUSH_CONTENT

[bshe, 2011/11/21 16:09:37]

Done.

+#else
   window_ = browser->BrowserShowHtmlDialog(this, parent);
+#endif
 }
 
 bool CertificateViewerDialog::IsDialogModal() const {
   return false;
 }
 
 string16 CertificateViewerDialog::GetDialogTitle() const {
   return title_;
 }
 
@@ skipping 312 matching lines @@
   cert_sub_fields->Append(node_details = new DictionaryValue());
   node_details->SetString("label",
       l10n_util::GetStringUTF8(IDS_CERT_INFO_SHA1_FINGERPRINT_LABEL));
   node_details->SetString("payload.val",
       x509_certificate_model::HashCertSHA1(cert));
 
   // Send certificate information to javascript.
   web_ui_->CallJavascriptFunction("cert_viewer.getCertificateFields",
       root_list);
 }