Re-land:

chrome/browser/ui/views/tab_contents/native_tab_contents_container_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/views/tab_contents/native_tab_contents_container_gtk.h"
 
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
+#include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/interstitial_page.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "views/focus/focus_manager.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabContentsContainerGtk, public:
 
 NativeTabContentsContainerGtk::NativeTabContentsContainerGtk(
@@ skipping 11 matching lines @@
 
 void NativeTabContentsContainerGtk::AttachContents(TabContents* contents) {
   Attach(contents->GetNativeView());
 }
 
 void NativeTabContentsContainerGtk::DetachContents(TabContents* contents) {
   gtk_widget_hide(contents->GetNativeView());
 
   // Now detach the TabContents.
   Detach();
+
+  static_cast<TabContentsViewViews*>(contents->view())->Unparent();
 }
 
 void NativeTabContentsContainerGtk::SetFastResize(bool fast_resize) {
   set_fast_resize(fast_resize);
 }
 
 void NativeTabContentsContainerGtk::RenderViewHostChanged(
     RenderViewHost* old_host,
     RenderViewHost* new_host) {
   // If we are focused, we need to pass the focus to the new RenderViewHost.
@@ skipping 87 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabContentsContainer, public:
 
 // static
 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer(
     TabContentsContainer* container) {
   return new NativeTabContentsContainerGtk(container);
 }