Dismiss action in tab modal dialogs.

chrome/browser/ui/gtk/tab_modal_confirm_dialog_gtk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/tab_modal_confirm_dialog_gtk.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 14 matching lines @@
 TabModalConfirmDialog* TabModalConfirmDialog::Create(
     TabModalConfirmDialogDelegate* delegate,
     content::WebContents* web_contents) {
   return new TabModalConfirmDialogGtk(delegate, web_contents);
 }
 
 TabModalConfirmDialogGtk::TabModalConfirmDialogGtk(
     TabModalConfirmDialogDelegate* delegate,
     content::WebContents* web_contents)
     : delegate_(delegate),
-      window_(NULL) {
+      window_(NULL),
+      closing_(false) {
   dialog_ = gtk_vbox_new(FALSE, ui::kContentAreaSpacing);
   GtkWidget* label = gtk_label_new(
       UTF16ToUTF8(delegate->GetMessage()).c_str());
   gfx::Image* icon = delegate->GetIcon();
   GtkWidget* image = icon ? gtk_image_new_from_pixbuf(icon->ToGdkPixbuf())
                           : gtk_image_new_from_stock(GTK_STOCK_DIALOG_QUESTION,
                                                      GTK_ICON_SIZE_DIALOG);
   gtk_misc_set_alignment(GTK_MISC(image), 0.5, 0.0);
 
   gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
@@ skipping 55 matching lines @@
 
   window_ = CreateWebContentsModalDialogGtk(dialog_, cancel_);
   delegate_->set_close_delegate(this);
 
   WebContentsModalDialogManager* web_contents_modal_dialog_manager =
       WebContentsModalDialogManager::FromWebContents(web_contents);
   web_contents_modal_dialog_manager->ShowDialog(window_);
 }
 
 TabModalConfirmDialogGtk::~TabModalConfirmDialogGtk() {
+  // Provide a disposition in case the dialog was closed without accepting or
+  // cancelling.
+  delegate_->Close();
+
   gtk_widget_destroy(dialog_);
 }
 
 void TabModalConfirmDialogGtk::AcceptTabModalDialog() {
   OnAccept(NULL);
 }
 
 void TabModalConfirmDialogGtk::CancelTabModalDialog() {
   OnCancel(NULL);
 }
 
 void TabModalConfirmDialogGtk::CloseDialog() {
-  gtk_widget_destroy(window_);
+  if (!closing_) {
+    closing_ = true;
+    gtk_widget_destroy(window_);
+  }
 }
 
 void TabModalConfirmDialogGtk::OnAccept(GtkWidget* widget) {
   delegate_->Accept();
 }
 
 void TabModalConfirmDialogGtk::OnCancel(GtkWidget* widget) {
   delegate_->Cancel();
 }
 
 void TabModalConfirmDialogGtk::OnLinkClicked(GtkWidget* widget) {
   delegate_->LinkClicked(event_utils::DispositionForCurrentButtonPressEvent());
 }
 
 void TabModalConfirmDialogGtk::OnDestroy(GtkWidget* widget) {
   delete this;
 }