Reland add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs.

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/i18n/time_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "base/string_number_conversions.h"
-#include "chrome/browser/ui/webui/certificate_viewer.h"
-#include "chrome/common/url_constants.h"
+#include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/gtk/certificate_dialogs.h"
-#include "chrome/browser/ui/browser_dialogs.h"
+#include "chrome/browser/ui/webui/certificate_viewer.h"
+#include "chrome/browser/ui/webui/chrome_web_ui.h"
 #include "chrome/common/net/x509_certificate_model.h"
+#include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "grit/generated_resources.h"
 
 namespace {
 
 // Default width/height of the dialog.
 const int kDefaultWidth = 450;
 const int kDefaultHeight = 450;
 
 }  // namespace
 
-// Shows a certificate using the WebUI certificate viewer.
+// Shows a certificate using the native or WebUI certificate viewer.
 void ShowCertificateViewer(gfx::NativeWindow parent,
                            net::X509Certificate* cert) {
-  CertificateViewerDialog::ShowDialog(parent, cert);
+  if (ChromeWebUI::IsMoreWebUI()) {
+    CertificateViewerDialog::ShowDialog(parent, cert);
+  } else {
+    ShowNativeCertificateViewer(parent, cert);
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // CertificateViewerDialog
 
 void CertificateViewerDialog::ShowDialog(gfx::NativeWindow parent,
                                          net::X509Certificate* cert) {
   Browser* browser = BrowserList::GetLastActive();
   DCHECK(browser);
   browser->BrowserShowHtmlDialog(new CertificateViewerDialog(parent, cert),
                                  parent);
 }
 
 CertificateViewerDialog::CertificateViewerDialog(gfx::NativeWindow parent,
                                                  net::X509Certificate* cert)
     : cert_(cert), parent_(parent) {
   // 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() {
+}
+
 bool CertificateViewerDialog::IsDialogModal() const {
   return true;
 }
 
 string16 CertificateViewerDialog::GetDialogTitle() const {
   return title_;
 }
 
 GURL CertificateViewerDialog::GetDialogContentURL() const {
   return GURL(chrome::kChromeUICertificateViewerURL);
@@ skipping 34 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // CertificateViewerDialogHandler
 
 CertificateViewerDialogHandler::CertificateViewerDialogHandler(
     gfx::NativeWindow parent,
     net::X509Certificate* cert) : cert_(cert), parent_(parent) {
   x509_certificate_model::GetCertChainFromCert(cert_->os_cert_handle(),
       &cert_chain_);
 }
 
+CertificateViewerDialogHandler::~CertificateViewerDialogHandler() {
+}
+
 void CertificateViewerDialogHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("exportCertificate",
       NewCallback(this,
           &CertificateViewerDialogHandler::ExportCertificate));
   web_ui_->RegisterMessageCallback("requestCertificateInfo",
       NewCallback(this,
           &CertificateViewerDialogHandler::RequestCertificateInfo));
   web_ui_->RegisterMessageCallback("requestCertificateFields",
       NewCallback(this,
           &CertificateViewerDialogHandler::RequestCertificateFields));
@@ skipping 258 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);
 }