diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-09 17:56:16 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-09 17:56:16 +0000 |
| commit | 01ba6d347ce84345b729131f27e48a1732aac83c (patch) | |
| tree | ca6518ef0d3f9503431e04ea783ffa7095568ca5 /views | |
| parent | cd4a83858ee51f7c8a0f9afb0f378b5bbd4e5098 (diff) | |
| download | chromium_src-01ba6d347ce84345b729131f27e48a1732aac83c.zip chromium_src-01ba6d347ce84345b729131f27e48a1732aac83c.tar.gz chromium_src-01ba6d347ce84345b729131f27e48a1732aac83c.tar.bz2 | |
When a GtkWidget was destroyed the NVH would not be detached.
There was a hack in location_bar_view to prevent an assert, but it would cause an other assert.
Also fixed a double delete with the find_bar_host.
BUG=None
TEST=Start Chrome Linux toolkit view. Close it. It should not assert.
Review URL: http://codereview.chromium.org/266034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28556 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/native/native_view_host.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/views/controls/native/native_view_host.cc b/views/controls/native/native_view_host.cc index 9cbeaf7..5f22a00 100644 --- a/views/controls/native/native_view_host.cc +++ b/views/controls/native/native_view_host.cc @@ -52,9 +52,9 @@ void NativeViewHost::SetPreferredSize(const gfx::Size& size) { } void NativeViewHost::NativeViewDestroyed() { - // TODO(beng): figure out if this should/could call Detach instead since as it - // stands right now this object is left in an inconsistent state. - native_view_ = NULL; + // Detach so we can clear our state and notify the native_wrapper_ to release + // ref on the native view. + Detach(); } //////////////////////////////////////////////////////////////////////////////// |