Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(238)

Unified Diff: ui/views/cocoa/widget_owner_nswindow_adapter.mm

Issue 2629593005: MacViews: Support -[NSWindow close] on sheets. (Closed)
Patch Set: no doNothing Created 3 years, 11 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 | « ui/views/cocoa/views_nswindow_delegate.mm ('k') | ui/views/widget/native_widget_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/cocoa/widget_owner_nswindow_adapter.mm
diff --git a/ui/views/cocoa/widget_owner_nswindow_adapter.mm b/ui/views/cocoa/widget_owner_nswindow_adapter.mm
index b40ea57f523cfa5353fe51c5b4e5e388a8e34349..6e62398ca3972cd2fd75c9e3fbb272adc3bd68f5 100644
--- a/ui/views/cocoa/widget_owner_nswindow_adapter.mm
+++ b/ui/views/cocoa/widget_owner_nswindow_adapter.mm
@@ -84,7 +84,8 @@ void WidgetOwnerNSWindowAdapter::OnWindowWillClose() {
// AppKit child window relationships break when the windows are not visible,
// so if the child is not visible, it won't currently be a child.
- DCHECK(![child_window isVisible] || [child_window parentWindow]);
+ if (![child_window isVisible])
+ DCHECK(![child_window parentWindow] && ![child_window sheetParent]);
DCHECK([child_window delegate]);
[child_window close];
« no previous file with comments | « ui/views/cocoa/views_nswindow_delegate.mm ('k') | ui/views/widget/native_widget_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698