Reland 179231

ui/views/widget/widget_delegate.cc

Index: ui/views/widget/widget_delegate.cc
diff --git a/ui/views/widget/widget_delegate.cc b/ui/views/widget/widget_delegate.cc
index 7a42ec477a4e14b34279c2ae4af8794dae360671..cb7b469da65cdeb1c738b9c12d36111d3e7c94f3 100644
--- a/ui/views/widget/widget_delegate.cc
+++ b/ui/views/widget/widget_delegate.cc
@@ -160,11 +160,17 @@ bool WidgetDelegate::ShouldDescendIntoChildForEventHandling(
 // WidgetDelegateView:
 
 WidgetDelegateView::WidgetDelegateView() {
+  // A WidgetDelegate should be deleted on DeleteDelegate.
+  set_owned_by_client();
 }
 
 WidgetDelegateView::~WidgetDelegateView() {
 }
 
+void WidgetDelegateView::DeleteDelegate() {
+  delete this;
+}
+
 Widget* WidgetDelegateView::GetWidget() {
   return View::GetWidget();
 }