Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4627)

Unified Diff: chrome/browser/renderer_host/render_widget_host_view_views.cc

Issue 6380005: Implement RenderWidgetHostViewViews::Destroy. See RWHVGtk for reference. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed unnecessary and impossible call from the destructor. Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_host/render_widget_host_view_views.cc
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 80804ad5b531c015aeb45955a65dcc86cdb923bc..b2ef4f6a9fe0441acedebb82a26a9898035faa13 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) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698