summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranicolao@google.com <anicolao@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-20 18:19:27 +0000
committeranicolao@google.com <anicolao@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-20 18:19:27 +0000
commitf224f15fb2d55747c3faf6e5e304c2eebcca12ab (patch)
treea8c2113778ac2eb19fa9ece57434294950f91780
parent105f93275fa84098ffec2f0c0009d959df12e3a1 (diff)
downloadchromium_src-f224f15fb2d55747c3faf6e5e304c2eebcca12ab.zip
chromium_src-f224f15fb2d55747c3faf6e5e304c2eebcca12ab.tar.gz
chromium_src-f224f15fb2d55747c3faf6e5e304c2eebcca12ab.tar.bz2
Implement RenderWidgetHostViewViews::Destroy. See RWHVGtk for reference.
TEST=manually, trybots BUG=none Review URL: http://codereview.chromium.org/6380005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71968 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/renderer_host/render_widget_host_view_views.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc
index d2e55fa7..d980cb4 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_views.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_views.cc
@@ -130,8 +130,6 @@ RenderWidgetHostViewViews::RenderWidgetHostViewViews(RenderWidgetHost* host)
}
RenderWidgetHostViewViews::~RenderWidgetHostViewViews() {
- RenderViewGone(base::TERMINATION_STATUS_NORMAL_TERMINATION,
- ResultCodes::NORMAL_EXIT);
}
void RenderWidgetHostViewViews::InitAsChild() {
@@ -293,8 +291,12 @@ void RenderWidgetHostViewViews::RenderViewGone(base::TerminationStatus status,
}
void RenderWidgetHostViewViews::Destroy() {
- // TODO(anicolao): deal with any special popup cleanup
- NOTIMPLEMENTED();
+ // host_'s destruction brought us here, null it out so we don't use it
+ host_ = NULL;
+
+ if (GetParent())
+ GetParent()->RemoveChildView(this);
+ MessageLoop::current()->DeleteSoon(FROM_HERE, this);
}
void RenderWidgetHostViewViews::SetTooltipText(const std::wstring& tip) {