chrome/browser/ui/webui/certificate_viewer_webui.cc - Issue 985133002: Remove NativeWebContentsModalDialog and NativePopup typedefs.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/certificate_viewer_webui.cc

Issue 985133002: Remove NativeWebContentsModalDialog and NativePopup typedefs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@extension-popup

Patch Set: Created 5 years, 9 months 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 | « chrome/browser/ui/webui/certificate_viewer_webui.h ('k') | chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/certificate_viewer_webui.cc

diff --git a/chrome/browser/ui/webui/certificate_viewer_webui.cc b/chrome/browser/ui/webui/certificate_viewer_webui.cc

index 57efa4d49b8e526ea63163d4354e304d155cd043..210ff3875bdd39ec46f8497bb4aa8502fdea2ada 100644

--- a/chrome/browser/ui/webui/certificate_viewer_webui.cc

+++ b/chrome/browser/ui/webui/certificate_viewer_webui.cc

@@ -25,7 +25,6 @@

using content::WebContents;

using content::WebUIMessageHandler;

-using web_modal::NativeWebContentsModalDialog;

// Shows a certificate using the WebUI certificate viewer.

void ShowCertificateViewer(WebContents* web_contents,

@@ -58,7 +57,7 @@ void CertificateViewerModalDialog::Show(content::WebContents* web_contents,

this);

}

-NativeWebContentsModalDialog

+gfx::NativeWindow

CertificateViewerModalDialog::GetNativeWebContentsModalDialog() {

#if defined(USE_AURA)

return window_;

@@ -232,8 +231,7 @@ void CertificateViewerDialog::Show(WebContents* web_contents,

web_contents);

}

-NativeWebContentsModalDialog

-CertificateViewerDialog::GetNativeWebContentsModalDialog() {

+gfx::NativeWindow CertificateViewerDialog::GetNativeWebContentsModalDialog() {

return dialog_->GetNativeDialog();

}

@@ -276,7 +274,7 @@ void CertificateViewerDialogHandler::ExportCertificate(

if (cert_index < 0)

return;

- NativeWebContentsModalDialog window =

+ gfx::NativeWindow window =

platform_util::GetTopLevel(dialog_->GetNativeWebContentsModalDialog());

ShowCertExportDialog(web_ui()->GetWebContents(),

window,