Fix some browser shutdown issues on Linux.

chrome/browser/gtk/browser_window_gtk.cc

 // Copyright (c) 2009 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/gtk/browser_window_gtk.h"
 
+#include "base/base_paths_linux.h"
 #include "base/logging.h"
-#include "base/base_paths_linux.h"
+#include "base/message_loop.h"
 #include "base/path_service.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/gtk/browser_toolbar_gtk.h"
 #include "chrome/browser/gtk/find_bar_gtk.h"
 #include "chrome/browser/gtk/nine_box.h"
 #include "chrome/browser/gtk/status_bubble_gtk.h"
 #include "chrome/browser/gtk/tab_contents_container_gtk.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
 #include "chrome/browser/tab_contents/web_contents.h"
@@ skipping 24 matching lines @@
   DCHECK(pixbuf) << "failed to load " << resource_id << " " << data.size();
 
   // The pixbuf is owned by the loader, so add a ref so when we delete the
   // loader, the pixbuf still exists.
   g_object_ref(pixbuf);
   g_object_unref(loader);
 
   return pixbuf;
 }
 
-gboolean MainWindowDestroyed(GtkWindow* window, BrowserWindowGtk* browser_win) {
-  delete browser_win;
-  return FALSE;  // Don't stop this message.
-}
-
 gboolean MainWindowConfigured(GtkWindow* window, GdkEventConfigure* event,
                               BrowserWindowGtk* browser_win) {
   gfx::Rect bounds = gfx::Rect(event->x, event->y, event->width, event->height);
   browser_win->OnBoundsChanged(bounds);
   return FALSE;
 }
 
 gboolean MainWindowStateChanged(GtkWindow* window, GdkEventWindowState* event,
                                 BrowserWindowGtk* browser_win) {
   browser_win->OnStateChanged(event->new_window_state);
@@ skipping 59 matching lines @@
                   GDK_RGB_DITHER_NORMAL, 0, 0);
   gdk_pixbuf_unref(pixbuf);
 
   return FALSE;  // Allow subwidgets to paint.
 }
 
 void BrowserWindowGtk::Init() {
   window_ = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
   gtk_window_set_default_size(window_, 640, 480);
   g_signal_connect(G_OBJECT(window_), "destroy",
-                   G_CALLBACK(MainWindowDestroyed), this);
+                   G_CALLBACK(OnWindowDestroyed), this);
   g_signal_connect(G_OBJECT(window_), "configure-event",
                    G_CALLBACK(MainWindowConfigured), this);
   g_signal_connect(G_OBJECT(window_), "window-state-event",
                    G_CALLBACK(MainWindowStateChanged), this);
   bounds_ = GetInitialWindowBounds(window_);
 
   GtkAccelGroup* accel_group = gtk_accel_group_new();
   gtk_window_add_accel_group(window_, accel_group);
 
   GdkPixbuf* images[9] = {
@@ skipping 50 matching lines @@
   gint height = static_cast<gint>(bounds.height());
 
   gtk_window_move(window_, x, y);
   gtk_window_resize(window_, width, height);
 }
 
 void BrowserWindowGtk::Close() {
   if (!window_)
     return;
 
-  gtk_widget_destroy(GTK_WIDGET(window_));
+  GtkWidget* window = GTK_WIDGET(window_);
+  // To help catch bugs in any event handlers that might get fired during the
+  // destruction, set window_ to NULL before any handlers will run.
   window_ = NULL;
+  gtk_widget_destroy(window);
 }
 
 void BrowserWindowGtk::Activate() {
   gtk_window_present(window_);
 }
 
 bool BrowserWindowGtk::IsActive() const {
   NOTIMPLEMENTED();
   return true;
 }
@@ skipping 191 matching lines @@
 void BrowserWindowGtk::SetCustomFrame(bool custom_frame) {
   custom_frame_ = custom_frame;
   if (custom_frame_) {
     gtk_container_set_border_width(GTK_CONTAINER(vbox_), 2);
     // TODO(port): all the crazy blue title bar, etc.
     NOTIMPLEMENTED();
   } else {
     gtk_container_set_border_width(GTK_CONTAINER(vbox_), 0);
   }
 }
+
+// static
+gboolean BrowserWindowGtk::OnWindowDestroyed(GtkWidget* window,
+                                             BrowserWindowGtk* browser_win) {
+  // BUG 8712. When we gtk_widget_destroy() in Close(), this will emit the
+  // signal right away, and we will be here (while Close() is still in the
+  // call stack).  In order to not reenter Close(), and to also follow the
+  // expectations of BrowserList, we should run the BrowserWindowGtk destructor
+  // not now, but after the run loop goes back to process messages.  Otherwise
+  // we will remove ourself from BrowserList while it's being iterated.
+  // Additionally, now that we know the window is gone, we need to make sure to
+  // set window_ to NULL, otherwise we will try to close the window again when
+  // we call Close() in the destructor.
+  browser_win->window_ = NULL;
+  MessageLoop::current()->DeleteSoon(FROM_HERE, browser_win);

[darin (slow to review), 2009/03/12 22:26:25]

i love problems like this :-P

this LGTM.  DeleteSoon uses PostNonNestableTask, so you know for sure that the
stack will have unwound completely before this object gets deleted.

+  return FALSE;  // Don't stop this message.
+}
+