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

Unified Diff: chrome/browser/ui/cocoa/single_web_contents_dialog_manager_cocoa.mm

Issue 1446623003: [Reland] Enable AutoResize for Constrained Web Dialogs for Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 10 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
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 6b1d507a741cf34cb2fa91fc206063b626426c24..1cbaec863650dcd59cf7255b99389b0247481d93 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
@@ -58,8 +58,12 @@ void SingleWebContentsDialogManagerCocoa::Close() {
[[ConstrainedWindowSheetController controllerForSheet:sheet_]
closeSheet:sheet_];
client_->set_manager(nullptr);
+
+ bool dialog_was_open = client_->DialogWasShown();
client_->OnDialogClosing(); // |client_| might delete itself here.
- delegate_->WillClose(dialog()); // Deletes |this|.
+
+ if (dialog_was_open)
+ delegate_->WillClose(dialog()); // Deletes |this|.
}
void SingleWebContentsDialogManagerCocoa::Focus() {
« no previous file with comments | « chrome/browser/ui/cocoa/profiles/user_manager_mac.mm ('k') | chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698