Reland 179231

ui/views/window/dialog_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_WINDOW_DIALOG_DELEGATE_H_
 #define UI_VIEWS_WINDOW_DIALOG_DELEGATE_H_
 
 #include "base/compiler_specific.h"
 #include "base/string16.h"
 #include "ui/base/accessibility/accessibility_types.h"
@@ skipping 94 matching lines @@
   const DialogClientView* GetDialogClientView() const;
   DialogClientView* GetDialogClientView();
 
  protected:
   // Overridden from WindowDelegate:
   virtual ui::AccessibilityTypes::Role GetAccessibleWindowRole() const OVERRIDE;
 };
 
 // A DialogDelegate implementation that is-a View. Used to override GetWidget()
 // to call View's GetWidget() for the common case where a DialogDelegate
-// implementation is-a View.
+// implementation is-a View. Note that DialogDelegateView is not owned by
+// view's hierarchy and is expected to be deleted on DeleteDelegate call.
 class VIEWS_EXPORT DialogDelegateView : public DialogDelegate,
                                         public View {
  public:
   DialogDelegateView();
   virtual ~DialogDelegateView();
 
   // Create a |dialog| window Widget with the specified |context| or |parent|.
   static Widget* CreateDialogWidget(DialogDelegateView* dialog,
                                     gfx::NativeWindow context,
                                     gfx::NativeWindow parent);
 
   // Overridden from DialogDelegate:
+  virtual void DeleteDelegate() OVERRIDE;
   virtual Widget* GetWidget() OVERRIDE;
   virtual const Widget* GetWidget() const OVERRIDE;
   virtual View* GetContentsView() OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DialogDelegateView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WINDOW_DIALOG_DELEGATE_H_