chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm - Issue 18786005: Cleanup: remove redundant tab close observation from TabModalConfirmDialogDelegate

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/constrained_window/constrained_window_mac.mm

Issue 18786005: Cleanup: remove redundant tab close observation from TabModalConfirmDialogDelegate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 5 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/cocoa/constrained_window/constrained_window_mac.h ('k') | chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm

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

index 49d753fc46578d4e18456c1c840ca1c004dc37e2..a7cb5bec75a09ce6f3172b713a2f6760d73ba3a3 100644

--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm

+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.mm

@@ -25,7 +25,8 @@ ConstrainedWindowMac::ConstrainedWindowMac(

: delegate_(delegate),

web_contents_(web_contents),

sheet_([sheet retain]),

- shown_(false) {

+ shown_(false),

+ closing_(false) {

DCHECK(web_contents);

DCHECK(sheet_.get());

WebContentsModalDialogManager* web_contents_modal_dialog_manager =

@@ -54,6 +55,10 @@ void ConstrainedWindowMac::ShowWebContentsModalDialog() {

}

void ConstrainedWindowMac::CloseWebContentsModalDialog() {

+ if (closing_)

+ return;

+ closing_ = true;

[[ConstrainedWindowSheetController controllerForSheet:sheet_]

closeSheet:sheet_];

WebContentsModalDialogManager* web_contents_modal_dialog_manager =