Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3305)

Unified Diff: chrome/browser/ui/views/certificate_viewer_win.cc

Issue 61093002: Make certificate viewer non-modal using BaseShellDialog to fix aura painting (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/shell_dialogs/DEPS » ('j') | ui/shell_dialogs/certificate_viewer_dialog_win.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..c26393f2a8c1c0cc3a35179abb7955ba8fb3de7c 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,8 @@ 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);
+ ui::CertificateViewerDialogWin::Show(
+ parent->GetDispatcher()->GetAcceleratedWidget(), cert);
} else {
NOTIMPLEMENTED();
}
« no previous file with comments | « no previous file | ui/shell_dialogs/DEPS » ('j') | ui/shell_dialogs/certificate_viewer_dialog_win.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698