Fix crash/leak issue in native_view_host_gtk.cc.

views/controls/native/native_view_host.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.h"
 
 #include "base/logging.h"
 #include "app/gfx/canvas.h"
 #include "views/controls/native/native_view_host_wrapper.h"
 #include "views/widget/widget.h"
@@ skipping 22 matching lines @@
   // The native widget is placed relative to the root. As such, we need to
   // know when the position of any ancestor changes, or our visibility relative
   // to other views changed as it'll effect our position relative to the root.
   SetNotifyWhenVisibleBoundsInRootChanges(true);
 }
 
 NativeViewHost::~NativeViewHost() {
 }
 
 void NativeViewHost::Attach(gfx::NativeView native_view) {
+  DCHECK(native_view);
   DCHECK(!native_view_);
   native_view_ = native_view;
   // If set_focus_view() has not been invoked, this view is the one that should
   // be seen as focused when the native view receives focus.
   if (!focus_view_)
     focus_view_ = this;
   native_wrapper_->NativeViewAttached();
 }
 
 void NativeViewHost::Detach() {
-  DCHECK(native_view_);
-  native_wrapper_->NativeViewDetaching();
-  native_view_ = NULL;
+  Detach(false);
 }
 
 void NativeViewHost::SetPreferredSize(const gfx::Size& size) {
   preferred_size_ = size;
   PreferredSizeChanged();
 }
 
 void NativeViewHost::NativeViewDestroyed() {
   // Detach so we can clear our state and notify the native_wrapper_ to release
   // ref on the native view.
-  Detach();
+  Detach(true);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeViewHost, View overrides:
 
 gfx::Size NativeViewHost::GetPreferredSize() {
   return preferred_size_;
 }
 
 void NativeViewHost::Layout() {
@@ skipping 62 matching lines @@
 }
 
 std::string NativeViewHost::GetClassName() const {
   return kViewClassName;
 }
 
 void NativeViewHost::Focus() {
   native_wrapper_->SetFocus();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// NativeViewHost, private:
+
+void NativeViewHost::Detach(bool destroyed) {
+  DCHECK(native_view_);
+  native_wrapper_->NativeViewDetaching(destroyed);
+  native_view_ = NULL;
+}
+
 }  // namespace views