GTK: Another attempt at fixing gtk_floating_container_forall() crasher.

chrome/browser/gtk/tab_contents_container_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/tab_contents_container_gtk.h"
 
 #include "base/gfx/native_widget_types.h"
 #include "chrome/browser/gtk/gtk_floating_container.h"
 #include "chrome/browser/gtk/status_bubble_gtk.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ skipping 16 matching lines @@
 
 }  // namespace
 
 TabContentsContainerGtk::TabContentsContainerGtk(StatusBubbleGtk* status_bubble)
     : tab_contents_(NULL),
       status_bubble_(status_bubble) {
   Init();
 }
 
 TabContentsContainerGtk::~TabContentsContainerGtk() {
+  floating_.Destroy();
 }
 
 void TabContentsContainerGtk::Init() {
   // A high level overview of the TabContentsContainer:
   //
   // +- GtkFloatingContainer |floating_| -------------------------------+
   // |+- GtkFixedContainer |fixed_| -----------------------------------+|
   // ||                                                                ||
   // ||                                                                ||
   // ||                                                                ||
   // ||                                                                ||
-  // |+- (StatusBubble) ------+                +- (Popups) ------------+|
-  // |+                       +----------------+                       ||
-  // |+-----------------------+                +-----------------------+|
+  // |+- (StatusBubble) ------+                                        ||
+  // |+                       +                                        ||
+  // |+-----------------------+----------------------------------------+|
   // +------------------------------------------------------------------+
 
-  floating_ = gtk_floating_container_new();
+  floating_.Own(gtk_floating_container_new());
 
   fixed_ = gtk_fixed_new();
   g_signal_connect(fixed_, "size-allocate",
                    G_CALLBACK(OnFixedSizeAllocate), this);
-  gtk_container_add(GTK_CONTAINER(floating_), fixed_);
+  gtk_container_add(GTK_CONTAINER(floating_.get()), fixed_);
 
-  gtk_floating_container_add_floating(GTK_FLOATING_CONTAINER(floating_),
+  gtk_floating_container_add_floating(GTK_FLOATING_CONTAINER(floating_.get()),
                                       status_bubble_->widget());
-  g_signal_connect(floating_, "set-floating-position",
+  g_signal_connect(floating_.get(), "set-floating-position",
                    G_CALLBACK(OnSetFloatingPosition), this);
 
   gtk_widget_show(fixed_);
-  gtk_widget_show(floating_);
+  gtk_widget_show(floating_.get());
 }
 
 void TabContentsContainerGtk::AddContainerToBox(GtkWidget* box) {
-  gtk_box_pack_start(GTK_BOX(box), floating_, TRUE, TRUE, 0);
+  gtk_box_pack_start(GTK_BOX(box), floating_.get(), TRUE, TRUE, 0);
 }
 
 void TabContentsContainerGtk::SetTabContents(TabContents* tab_contents) {
   if (tab_contents_) {
     gfx::NativeView widget = tab_contents_->GetNativeView();
     if (widget)
       gtk_widget_hide(widget);
 
     tab_contents_->WasHidden();
 
@@ skipping 103 matching lines @@
   gtk_container_child_set_property(GTK_CONTAINER(floating_container),
                                    widget, "x", &value);
 
   int child_y = std::max(
       allocation->y + allocation->height - requisition.height, 0);
   g_value_set_int(&value, child_y);
   gtk_container_child_set_property(GTK_CONTAINER(floating_container),
                                    widget, "y", &value);
   g_value_unset(&value);
 }