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

chrome/browser/ui/webui/certificate_viewer.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_CERTIFICATE_VIEWER_H_
 #define CHROME_BROWSER_UI_WEBUI_CERTIFICATE_VIEWER_H_
 #pragma once
 
 #include "base/values.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
 #include "net/base/x509_certificate.h"
 #include "ui/gfx/native_widget_types.h"
 
-// Displays the WebUI certificate viewer dialog for the passed in certificate.
+// Displays the native or WebUI certificate viewer dialog for the given
+// certificate.
 void ShowCertificateViewer(gfx::NativeWindow parent,
                            net::X509Certificate*);
 
 // Dialog for displaying detailed certificate information. This is used in linux
 // and chromeos builds to display detailed information in a floating dialog when
 // the user clicks on "Certificate Information" from the lock icon of a web site
 // or "View" from the Certificate Manager.
 class CertificateViewerDialog : private HtmlDialogUIDelegate {
  public:
   // Shows the certificate viewer dialog for the passed in certificate.
   static void ShowDialog(gfx::NativeWindow parent,
                          net::X509Certificate* cert);
+  virtual ~CertificateViewerDialog();
 
  private:
   // Construct a certificate viewer for the passed in certificate. A reference
   // to the certificate pointer is added for the lifetime of the certificate
   // viewer.
   explicit CertificateViewerDialog(gfx::NativeWindow parent,
                                    net::X509Certificate* cert);
 
   // Overridden from HtmlDialogUI::Delegate:
   virtual bool IsDialogModal() const OVERRIDE;
@@ skipping 20 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(CertificateViewerDialog);
 };
 
 // Dialog handler which handles calls from the JS WebUI code to view certificate
 // details and export the certificate.
 class CertificateViewerDialogHandler : public WebUIMessageHandler {
  public:
   CertificateViewerDialogHandler(gfx::NativeWindow parent,
                                  net::X509Certificate* cert);
+  virtual ~CertificateViewerDialogHandler();
 
   // Overridden from WebUIMessageHandler
   virtual void RegisterMessages();
 
  private:
   // Brings up the export certificate dialog for the chosen certificate in the
   // chain.
   //
   // The input is an integer index to the certificate in the chain to export.
   void ExportCertificate(const base::ListValue* args);
@@ skipping 15 matching lines @@
   // The parent window.
   gfx::NativeWindow parent_;
 
   // The certificate chain.
   net::X509Certificate::OSCertHandles cert_chain_;
 
   DISALLOW_COPY_AND_ASSIGN(CertificateViewerDialogHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CERTIFICATE_VIEWER_H_