Window Delegate Improvements:

- Windows now must have a Delegate. Just construct the default WindowDelegate
if
you don't want to have to write one in testing.
- Windows now obtain their contents view by asking the delegate via
WindowDelegate::GetContentsView.
- Contents views no longer need to manually store a pointer to the Window that
contains them, WindowDelegate does this automatically via its window()
accessor.

Reviewer notes:
- review window_delegate.h first, then
- window.h/cc
- custom frame window.h/cc
- constrained_window_impl.h/cc
- then everything else (just updating all call sites)

B=1280060

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 4 deletions

diff --git a/chrome/browser/views/html_dialog_view.h b/chrome/browser/views/html_dialog_view.h
index 54f8f15..a07e5e3 100644
--- a/chrome/browser/views/html_dialog_view.h
+++ b/chrome/browser/views/html_dialog_view.h
@@ -60,7 +60,7 @@ class HtmlDialogView
   virtual ~HtmlDialogView();
 
   // Initializes the contents of the dialog (the DOMView and the callbacks).
-  void InitDialog(ChromeViews::Window* dialog);
+  void InitDialog();
 
   // Overridden from ChromeViews::View:
   virtual void GetPreferredSize(CSize *out);
@@ -70,6 +70,7 @@ class HtmlDialogView
   virtual bool IsModal() const;
   virtual std::wstring GetWindowTitle() const;
   virtual void WindowClosing();
+  virtual ChromeViews::View* GetContentsView();
 
   // Overridden from HtmlDialogContentsDelegate:
   virtual GURL GetDialogContentURL() const;
@@ -101,9 +102,6 @@ class HtmlDialogView
   virtual void UpdateTargetURL(TabContents* source, const GURL& url);
 
  private:
-  // The dialog this view is displayed in.
-  ChromeViews::Window* dialog_;
-
   // The Browser object which created this html dialog; we send all
   // window opening/navigations to this object.
   Browser* parent_browser_;