Reland 179231

ui/views/window/dialog_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/window/dialog_delegate.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/views/controls/button/text_button.h"
@@ skipping 133 matching lines @@
   return GetWidget()->client_view()->AsDialogClientView();
 }
 
 ui::AccessibilityTypes::Role DialogDelegate::GetAccessibleWindowRole() const {
   return ui::AccessibilityTypes::ROLE_DIALOG;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DialogDelegateView:
 
-DialogDelegateView::DialogDelegateView() {}
+DialogDelegateView::DialogDelegateView() {
+  // A WidgetDelegate should be deleted on DeleteDelegate.
+  set_owned_by_client();
+}
 
 DialogDelegateView::~DialogDelegateView() {}
 
 // static
 Widget* DialogDelegateView::CreateDialogWidget(DialogDelegateView* dialog,
                                                gfx::NativeWindow context,
                                                gfx::NativeWindow parent) {
   return CreateDialogWidgetImpl(dialog, context, parent);
 }
 
+void DialogDelegateView::DeleteDelegate() {
+  delete this;
+}
+
 Widget* DialogDelegateView::GetWidget() {
   return View::GetWidget();
 }
 
 const Widget* DialogDelegateView::GetWidget() const {
   return View::GetWidget();
 }
 
 View* DialogDelegateView::GetContentsView() {
   return this;
 }
 
 }  // namespace views