Reland 179231

ui/views/window/dialog_delegate.cc

Index: ui/views/window/dialog_delegate.cc
diff --git a/ui/views/window/dialog_delegate.cc b/ui/views/window/dialog_delegate.cc
index 439f5ccc56b664d058ed6098a06b3f1bc0ba0671..b4bfdeb680504e9221cadd7a6707b2afd436429d 100644
--- a/ui/views/window/dialog_delegate.cc
+++ b/ui/views/window/dialog_delegate.cc
@@ -126,11 +126,17 @@ ui::AccessibilityTypes::Role DialogDelegate::GetAccessibleWindowRole() const {
 // DialogDelegateView:
 
 DialogDelegateView::DialogDelegateView() {
+  // A WidgetDelegate should be deleted on DeleteDelegate.
+  set_owned_by_client();
 }
 
 DialogDelegateView::~DialogDelegateView() {
 }
 
+void DialogDelegateView::DeleteDelegate() {
+  delete this;
+}
+
 Widget* DialogDelegateView::GetWidget() {
   return View::GetWidget();
 }