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

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

Issue 18179004: Dismiss action in tab modal dialogs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test for Mac 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
Index: chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm
diff --git a/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm b/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm
index bdca853ebcf2ab6c9a6954bd61baca1fdf8d3a91..40a949ae1bdad0802c9ec1fdec1832e8913e24d5 100644
--- a/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm
+++ b/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.mm
@@ -57,7 +57,8 @@ TabModalConfirmDialog* TabModalConfirmDialog::Create(
TabModalConfirmDialogMac::TabModalConfirmDialogMac(
TabModalConfirmDialogDelegate* delegate,
content::WebContents* web_contents)
- : delegate_(delegate) {
+ : closing_(false),
+ delegate_(delegate) {
bridge_.reset([[TabModalConfirmDialogMacBridge alloc]
initWithDelegate:delegate]);
@@ -103,10 +104,16 @@ void TabModalConfirmDialogMac::CancelTabModalDialog() {
}
void TabModalConfirmDialogMac::CloseDialog() {
- window_->CloseWebContentsModalDialog();
+ if (!closing_) {
+ closing_ = true;
+ window_->CloseWebContentsModalDialog();
+ }
}
void TabModalConfirmDialogMac::OnConstrainedWindowClosed(
ConstrainedWindowMac* window) {
+ // Provide a disposition in case the dialog was closed without accepting or
+ // cancelling.
+ delegate_->Close();
delete this;
}
« no previous file with comments | « chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.h ('k') | chrome/browser/ui/gtk/tab_modal_confirm_dialog_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698