Reland 179231

ui/views/widget/widget_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/widget/widget_delegate.h"
 
 #include "base/utf_string_conversions.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/view.h"
@@ skipping 142 matching lines @@
 bool WidgetDelegate::ShouldDescendIntoChildForEventHandling(
     gfx::NativeView child,
     const gfx::Point& location) {
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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();
 }
 
 const Widget* WidgetDelegateView::GetWidget() const {
   return View::GetWidget();
 }
 
 }  // namespace views