Make certificate viewer non-modal using BaseShellDialog to fix aura painting

chrome/browser/ui/views/certificate_viewer_win.cc

Index: chrome/browser/ui/views/certificate_viewer_win.cc
diff --git a/chrome/browser/ui/views/certificate_viewer_win.cc b/chrome/browser/ui/views/certificate_viewer_win.cc
index fa345391d1eb89c4dec3a0a3ba4532f566aa4c20..9e8c513a00f29bac937c8e0e861e592d5e2b03aa 100644
--- a/chrome/browser/ui/views/certificate_viewer_win.cc
+++ b/chrome/browser/ui/views/certificate_viewer_win.cc
@@ -15,10 +15,12 @@
 #include "chrome/browser/ui/host_desktop.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
+#include "ui/shell_dialogs/certificate_viewer_dialog_win.h"
 #endif
 
 namespace {
 
+#if !defined(USE_AURA)
 void ShowCertificateViewerImpl(content::WebContents* web_contents,
                                HWND parent,
                                net::X509Certificate* cert) {
@@ -46,6 +48,7 @@ void ShowCertificateViewerImpl(content::WebContents* web_contents,
 
   CertFreeCertificateContext(cert_list);
 }
+#endif
 
 }  // namespace
 
@@ -55,8 +58,9 @@ void ShowCertificateViewer(content::WebContents* web_contents,
                            net::X509Certificate* cert) {
   if (chrome::GetHostDesktopTypeForNativeWindow(parent) !=
       chrome::HOST_DESKTOP_TYPE_ASH) {
-    ShowCertificateViewerImpl(
-        web_contents, parent->GetDispatcher()->GetAcceleratedWidget(), cert);
+    CHECK(cert);
+    ui::CertificateViewerDialogWin::Show(
+        parent->GetDispatcher()->GetAcceleratedWidget(), *cert);
   } else {
     NOTIMPLEMENTED();
   }