chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm - Issue 11308053: Merge 167819 - Fix crash when programatically closing media gallery dialog

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/extensions/media_galleries_dialog_cocoa.mm

Issue 11308053: Merge 167819 - Fix crash when programatically closing media gallery dialog (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1312/src/

Patch Set: Created 8 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 | « chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h ('k') | chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm

===================================================================

--- chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm (revision 168041)

+++ chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm (working copy)

@@ -134,6 +134,8 @@

if (window_)

window_->CloseConstrainedWindow();

break;

+ case NSRunStoppedResponse:

+ break;

default:

NOTREACHED();

break;

@@ -205,7 +207,7 @@

// As required by ConstrainedWindowMacDelegate, close the sheet if

// it's still open.

if (is_sheet_open())

- [NSApp endSheet:sheet()];

+ [NSApp endSheet:[alert_ window]];

controller_->DialogFinished(accepted_);

}