Reland 179231

ui/views/widget/widget_delegate.h

 // 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.
 
 #ifndef UI_VIEWS_WIDGET_WIDGET_DELEGATE_H_
 #define UI_VIEWS_WIDGET_WIDGET_DELEGATE_H_
 
 #include <string>
 
 #include "ui/base/accessibility/accessibility_types.h"
@@ skipping 146 matching lines @@
   virtual ~WidgetDelegate() {}
 
  private:
   View* default_contents_view_;
 
   DISALLOW_COPY_AND_ASSIGN(WidgetDelegate);
 };
 
 // A WidgetDelegate implementation that is-a View. Used to override GetWidget()
 // to call View's GetWidget() for the common case where a WidgetDelegate
 // implementation is-a View.

[Ben Goodger (Google), 2013/01/28 17:31:14]

you should note the ownership here.

[xiyuan, 2013/01/28 18:50:09]

Done.

 class VIEWS_EXPORT WidgetDelegateView : public WidgetDelegate, public View {
  public:
   WidgetDelegateView();
   virtual ~WidgetDelegateView();
 
   // Overridden from WidgetDelegate:
+  virtual void DeleteDelegate() OVERRIDE;
   virtual Widget* GetWidget() OVERRIDE;
   virtual const Widget* GetWidget() const OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WidgetDelegateView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_WIDGET_DELEGATE_H_