components/web_modal/web_contents_modal_dialog_manager.cc - Issue 1779383002: MacViews: Remove constrained window dependencies for certificate viewer.

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: components/web_modal/web_contents_modal_dialog_manager.cc

Issue 1779383002: MacViews: Remove constrained window dependencies for certificate viewer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase & address review comments. Created 4 years, 7 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

« components/web_modal/web_contents_modal_dialog_manager.h ('K') | « components/web_modal/web_contents_modal_dialog_manager.h ('k') | components/web_modal/web_contents_modal_dialog_views.cc » ('j') | components/web_modal/web_contents_modal_dialog_views.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/web_modal/web_contents_modal_dialog_manager.cc

diff --git a/components/web_modal/web_contents_modal_dialog_manager.cc b/components/web_modal/web_contents_modal_dialog_manager.cc

index 52b404580291059c6c5d0bd1338ffbb2788ad2e6..6217d3e7f3daacd590f48f55bdf4fa45671f7b68 100644

--- a/components/web_modal/web_contents_modal_dialog_manager.cc

+++ b/components/web_modal/web_contents_modal_dialog_manager.cc

@@ -35,9 +35,13 @@ void WebContentsModalDialogManager::SetDelegate(

}

-void WebContentsModalDialogManager::ShowModalDialog(gfx::NativeWindow dialog) {

- std::unique_ptr<SingleWebContentsDialogManager> mgr(

- CreateNativeWebModalManager(dialog, this));

+void WebContentsModalDialogManager::ShowModalDialog(gfx::NativeWindow dialog,

+ bool parented) {

+ std::unique_ptr<SingleWebContentsDialogManager> mgr;

+ if (parented)

+ mgr.reset(CreateParentedNativeWebModalManager(dialog, this));

tapted 2016/05/13 06:08:46 avoid this on !mac

Patti Lor 2016/05/18 04:48:38 Done.

+ else

+ mgr.reset(CreateNativeWebModalManager(dialog, this));

ShowDialogWithManager(dialog, std::move(mgr));

}