Fix DELETE_EVENT handling in 3 places.

chrome/browser/ui/gtk/js_modal_dialog_gtk.cc

 // Copyright (c) 2011 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/js_modal_dialog_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 117 matching lines @@
   } else {
     // Add the OK button and focus it.
     GtkWidget* ok_button = gtk_dialog_add_button(GTK_DIALOG(gtk_dialog_),
         GTK_STOCK_OK, GTK_RESPONSE_OK);
     if (ui::MessageBoxFlags::kIsJavascriptPrompt != dialog_->dialog_flags())
       gtk_widget_grab_focus(ok_button);
   }
 
   gtk_dialog_set_default_response(GTK_DIALOG(gtk_dialog_), GTK_RESPONSE_OK);
   g_signal_connect(gtk_dialog_, "response", G_CALLBACK(OnResponseThunk), this);
+  // NULL out |gtk_dialog_| when it's destroyed.

[Elliot Glaysher, 2011/04/19 19:40:13]

Today I learn something about GTK.

+  g_signal_connect(gtk_dialog_, "destroy",
+                   G_CALLBACK(gtk_widget_destroyed), &gtk_dialog_);
 }
 
 JSModalDialogGtk::~JSModalDialogGtk() {
+  if (gtk_dialog_)
+    gtk_widget_destroy(gtk_dialog_);
+
+  // Now that the dialog is gone, we can put all the  windows into separate
+  // window groups so other dialogs are no longer app modal.
+  gtk_util::AppModalDismissedUngroupWindows();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // JSModalDialogGtk, NativeAppModalDialog implementation:
 
 int JSModalDialogGtk::GetAppModalDialogButtons() const {
   switch (dialog_->dialog_flags()) {
     case ui::MessageBoxFlags::kIsJavascriptAlert:
       return ui::MessageBoxFlags::DIALOGBUTTON_OK;
 
@@ skipping 10 matching lines @@
   }
 }
 
 void JSModalDialogGtk::ShowAppModalDialog() {
   gtk_util::ShowDialogWithMinLocalizedWidth(GTK_WIDGET(gtk_dialog_),
       IDS_ALERT_DIALOG_WIDTH_CHARS);
 }
 
 void JSModalDialogGtk::ActivateAppModalDialog() {
   DCHECK(gtk_dialog_);
-  gtk_window_present(GTK_WINDOW(gtk_dialog_));}
+  gtk_window_present(GTK_WINDOW(gtk_dialog_));
+}
 
 void JSModalDialogGtk::CloseAppModalDialog() {
   DCHECK(gtk_dialog_);
   OnResponse(gtk_dialog_, GTK_RESPONSE_DELETE_EVENT);
 }
 
 void JSModalDialogGtk::AcceptAppModalDialog() {
   OnResponse(gtk_dialog_, GTK_RESPONSE_OK);
 }
 
@@ skipping 14 matching lines @@
       break;
 
     case GTK_RESPONSE_CANCEL:
     case GTK_RESPONSE_DELETE_EVENT:   // User hit the X on the dialog.
       dialog_->OnCancel(ShouldSuppressJSDialogs(GTK_DIALOG(dialog)));
       break;
 
     default:
       NOTREACHED();
   }
-  gtk_widget_destroy(dialog);
 
-  // Now that the dialog is gone, we can put all the  windows into separate
-  // window groups so other dialogs are no longer app modal.
-  gtk_util::AppModalDismissedUngroupWindows();
   delete this;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeAppModalDialog, public:
 
 // static
 NativeAppModalDialog* NativeAppModalDialog::CreateNativeJavaScriptPrompt(
     JavaScriptAppModalDialog* dialog,
     gfx::NativeWindow parent_window) {
   return new JSModalDialogGtk(dialog, parent_window);
 }