chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm - 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: chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm

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

Patch Set: Keep a reference to the sheet window in single_web_contents_dialog_manager_cocoa.mm. Created 4 years, 6 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

« chrome/browser/ui/cocoa/certificate_viewer_mac_views.mm ('K') | « chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.h ('k') | chrome/browser/ui/views/native_web_contents_modal_dialog_manager_views.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm

diff --git a/chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm b/chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm

index 23c5c446165296633a6edd1510be0d48455fd8c6..b0ab8b7cffb04a5f87310f004e8944984bb36d0b 100644

--- a/chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm

+++ b/chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm

@@ -45,6 +45,7 @@ void SingleWebContentsDialogManagerCocoa::Show() {

[[ConstrainedWindowSheetController controllerForParentWindow:parent_window]

showSheet:sheet_ forParentView:parent_view];

+ dialog();

}

void SingleWebContentsDialogManagerCocoa::Hide() {

@@ -83,5 +84,8 @@ void SingleWebContentsDialogManagerCocoa::HostChanged(

}

gfx::NativeWindow SingleWebContentsDialogManagerCocoa::dialog() {

- return [sheet_ sheetWindow];

+ // Update |dialog_| if unpopulated or if the sheetWindow has changed.

+ if (!dialog_ || ([sheet_ sheetWindow] && dialog_ != [sheet_ sheetWindow]))

+ dialog_ = [sheet_ sheetWindow];

+ return dialog_;

}