Linux: Don't unparent unselected tab contentses.

Instead, hide them. Sometimes an unselected tab contents can get unhandled keyboard events after it's been deselected (if the renderer was really slow in handling and returning the event).

http://crbug.com/12178

Review URL: http://codereview.chromium.org/113545

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16329 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 2 deletions

diff --git a/chrome/browser/gtk/tab_contents_container_gtk.cc b/chrome/browser/gtk/tab_contents_container_gtk.cc
index ef4db61..be8fe19 100644
--- a/chrome/browser/gtk/tab_contents_container_gtk.cc
+++ b/chrome/browser/gtk/tab_contents_container_gtk.cc
@@ -28,7 +28,7 @@ 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();
 
@@ -44,9 +44,12 @@ void TabContentsContainerGtk::SetTabContents(TabContents* tab_contents) {
 
     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?
@@ -59,6 +62,14 @@ void TabContentsContainerGtk::SetTabContents(TabContents* tab_contents) {
   }
 }
 
+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) {