Fix DELETE_EVENT handling in 3 places.

chrome/browser/ui/gtk/hung_renderer_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/browser_dialogs.h"
 
 #include <gtk/gtk.h>
 
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 16 matching lines @@
 namespace {
 
 // A wrapper class that represents the Gtk dialog.
 class HungRendererDialogGtk {
  public:
   HungRendererDialogGtk();
   void ShowForTabContents(TabContents* hung_contents);
   void EndForTabContents(TabContents* hung_contents);
 
  private:
+  ~HungRendererDialogGtk();
+
   // The GtkTreeView column ids.
   enum {
     COL_FAVICON,
     COL_TITLE,
     COL_COUNT,
   };
 
   // Create the gtk dialog and add the widgets.
   void Init();
 
@@ skipping 11 matching lines @@
 
 // The response ID for the "Kill pages" button.  Anything positive should be
 // fine (the built in GtkResponseTypes are negative numbers).
 const int kKillPagesButtonResponse = 1;
 
 HungRendererDialogGtk::HungRendererDialogGtk()
     : dialog_(NULL), model_(NULL), contents_(NULL) {
   Init();
 }
 
+HungRendererDialogGtk::~HungRendererDialogGtk() {
+  DCHECK(g_instance == this);
+  g_instance = NULL;
+
+  if (dialog_)
+    gtk_widget_destroy(GTK_WIDGET(dialog_));
+}
+
 void HungRendererDialogGtk::Init() {
   dialog_ = GTK_DIALOG(gtk_dialog_new_with_buttons(
       l10n_util::GetStringUTF8(IDS_BROWSER_HANGMONITOR_RENDERER_TITLE).c_str(),
       NULL,  // No parent because tabs can span multiple windows.
       GTK_DIALOG_NO_SEPARATOR,
       l10n_util::GetStringUTF8(IDS_BROWSER_HANGMONITOR_RENDERER_END).c_str(),
       kKillPagesButtonResponse,
       l10n_util::GetStringUTF8(IDS_BROWSER_HANGMONITOR_RENDERER_WAIT).c_str(),
       GTK_RESPONSE_OK,
       NULL));
   gtk_dialog_set_default_response(dialog_, GTK_RESPONSE_OK);
   g_signal_connect(dialog_, "response", G_CALLBACK(OnResponseThunk), this);
+  // NULL out |dialog_| when it's destroyed.
+  g_signal_connect(dialog_, "destroy",
+                   G_CALLBACK(gtk_widget_destroyed), &dialog_);
 
   // We have an hbox with the frozen icon on the left.  On the right,
   // we have a vbox with the unresponsive text on top and a table of
   // tabs on bottom.
   // ·-----------------------------------·
   // |·---------------------------------·|
   // ||·----·|·------------------------·||
   // |||icon|||                        |||
   // ||·----·|| The folowing page(s).. |||
   // ||      ||                        |||
@@ skipping 86 matching lines @@
       contents->GetRenderProcessHost()) {
     gtk_widget_hide(GTK_WIDGET(dialog_));
     // Since we're closing, we no longer need this TabContents.
     contents_ = NULL;
   }
 }
 
 // When the user clicks a button on the dialog or closes the dialog, this
 // callback is called.
 void HungRendererDialogGtk::OnResponse(GtkWidget* dialog, int response_id) {
-  DCHECK(g_instance == this);
   switch (response_id) {
     case kKillPagesButtonResponse:
       // Kill the process.
       if (contents_ && contents_->GetRenderProcessHost()) {
         base::KillProcess(contents_->GetRenderProcessHost()->GetHandle(),
                           ResultCodes::HUNG, false);
       }
       break;
 
     case GTK_RESPONSE_OK:
     case GTK_RESPONSE_DELETE_EVENT:
       // Start waiting again for responsiveness.
       if (contents_ && contents_->render_view_host())
         contents_->render_view_host()->RestartHangMonitorTimeout();
       break;
     default:
       NOTREACHED();
   }
 
-  gtk_widget_destroy(GTK_WIDGET(dialog_));
-  delete g_instance;
-  g_instance = NULL;
+  delete this;
 }
 
 }  // namespace
 
 namespace browser {
 
 void ShowHungRendererDialog(TabContents* contents) {
   if (!logging::DialogsAreSuppressed()) {
     if (!g_instance)
       g_instance = new HungRendererDialogGtk();
     g_instance->ShowForTabContents(contents);
   }
 }
 
 void HideHungRendererDialog(TabContents* contents) {
   if (!logging::DialogsAreSuppressed() && g_instance)
     g_instance->EndForTabContents(contents);
 }
 
 }  // namespace browser