Linux: Don't unparent unselected tab contentses....

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/tab_contents/tab_contents.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
 #include "chrome/common/notification_service.h"
@@ skipping 10 matching lines @@
 }
 
 void TabContentsContainerGtk::AddContainerToBox(GtkWidget* box) {
   gtk_box_pack_start(GTK_BOX(box), vbox_, TRUE, TRUE, 0);
 }
 
 void TabContentsContainerGtk::SetTabContents(TabContents* tab_contents) {
   if (tab_contents_) {
     gfx::NativeView widget = tab_contents_->GetNativeView();
     if (widget)
-      gtk_container_remove(GTK_CONTAINER(vbox_), widget);
+      gtk_widget_hide(widget);
 
     tab_contents_->WasHidden();
 
     RemoveObservers();
   }
 
   tab_contents_ = tab_contents;
 
   // When detaching the last tab of the browser SetTabContents is invoked
   // with NULL. Don't attempt to do anything in that case.
   if (tab_contents_) {
     AddObservers();
 
     gfx::NativeView widget = tab_contents_->GetNativeView();
     if (widget) {
-      gtk_box_pack_end(GTK_BOX(vbox_), widget, TRUE, TRUE, 0);
+      // Pack it into |vbox_| if it isn't already.
+      if (widget->parent != vbox_)
+        gtk_box_pack_end(GTK_BOX(vbox_), widget, TRUE, TRUE, 0);
       gtk_widget_show(widget);
     }
+
     // We need to make sure that we are below the findbar.
     // Sometimes the content native view will be null.
     // TODO(estade): will this case ever cause findbar occlusion problems?
     if (tab_contents_->GetContentNativeView()) {
       GdkWindow* content_gdk_window =
           tab_contents_->GetContentNativeView()->window;
       if (content_gdk_window)
         gdk_window_lower(content_gdk_window);
     }
   }
 }
 
+void TabContentsContainerGtk::DetachTabContents(TabContents* tab_contents) {
+  gfx::NativeView widget = tab_contents_->GetNativeView();
+  if (widget) {
+    DCHECK_EQ(widget->parent, vbox_);
+    gtk_container_remove(GTK_CONTAINER(vbox_), widget);
+  }
+}
+
 void TabContentsContainerGtk::Observe(NotificationType type,
                                       const NotificationSource& source,
                                       const NotificationDetails& details) {
   if (type == NotificationType::RENDER_VIEW_HOST_CHANGED) {
     RenderViewHostSwitchedDetails* switched_details =
         Details<RenderViewHostSwitchedDetails>(details).ptr();
     RenderViewHostChanged(switched_details->old_host,
                           switched_details->new_host);
   } else if (type == NotificationType::TAB_CONTENTS_DESTROYED) {
     TabContentsDestroyed(Source<TabContents>(source).ptr());
@@ skipping 39 matching lines @@
   // RENDER_VIEW_HOST_CHANGED notification. This was used on Windows for focus
   // issues, and I'm not entirely convinced that this isn't necessary.
 }
 
 void TabContentsContainerGtk::TabContentsDestroyed(TabContents* contents) {
   // Sometimes, a TabContents is destroyed before we know about it. This allows
   // us to clean up our state in case this happens.
   DCHECK(contents == tab_contents_);
   SetTabContents(NULL);
 }