Fix crash/leak issue in native_view_host_gtk.cc.

views/controls/native/native_view_host_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 "views/controls/native/native_view_host_gtk.h"
 
 #include <gtk/gtk.h>
 #include <algorithm>
 
 #include "base/logging.h"
@@ skipping 45 matching lines @@
   // Always layout though.
   host_->Layout();
 
   // We own the native view as long as it's attached, so that we can safely
   // reparent it in multiple passes.
   gtk_widget_ref(host_->native_view());
 
   // TODO(port): figure out focus.
 }
 
-void NativeViewHostGtk::NativeViewDetaching() {
+void NativeViewHostGtk::NativeViewDetaching(bool destroyed) {
   DCHECK(host_->native_view());
 
   g_signal_handler_disconnect(G_OBJECT(host_->native_view()),
                               destroy_signal_id_);
   destroy_signal_id_ = 0;
 
   g_signal_handler_disconnect(G_OBJECT(host_->native_view()),
                               focus_signal_id_);
   focus_signal_id_ = 0;
 
   installed_clip_ = false;
 
+  if (fixed_ && !destroyed) {
+    DCHECK_NE(static_cast<gfx::NativeView>(NULL),
+              gtk_widget_get_parent(host_->native_view()));
+    gtk_container_remove(GTK_CONTAINER(fixed_), host_->native_view());
+    DCHECK_EQ(
+        0U, g_list_length(gtk_container_get_children(GTK_CONTAINER(fixed_))));
+  }
+
   g_object_unref(G_OBJECT(host_->native_view()));
 }
 
 void NativeViewHostGtk::AddedToWidget() {
   if (!fixed_)
     CreateFixed(false);
   if (gtk_widget_get_parent(fixed_))
     GetHostWidget()->ReparentChild(fixed_);
   else
     GetHostWidget()->AddChild(fixed_);
@@ skipping 104 matching lines @@
     return;
 
   gtk_widget_hide(fixed_);
   GetHostWidget()->RemoveChild(fixed_);
 
   if (host_->native_view()) {
     // We can safely remove the widget from its container since we own the
     // widget from the moment it is attached.
     gtk_container_remove(GTK_CONTAINER(fixed_), host_->native_view());
   }
-
+  // fixed_ should not have any children this point.
+  DCHECK_EQ(0U,
+            g_list_length(gtk_container_get_children(GTK_CONTAINER(fixed_))));
   gtk_widget_destroy(fixed_);
   fixed_ = NULL;
 }
 
 WidgetGtk* NativeViewHostGtk::GetHostWidget() const {
   return static_cast<WidgetGtk*>(host_->GetWidget());
 }
 
 // static
 void NativeViewHostGtk::CallDestroy(GtkObject* object,
@@ skipping 20 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeViewHostWrapper, public:
 
 // static
 NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper(
     NativeViewHost* host) {
   return new NativeViewHostGtk(host);
 }
 
 }  // namespace views