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, 1 insertions, 5 deletions

diff --git a/chrome/browser/views/importing_progress_view.h b/chrome/browser/views/importing_progress_view.h
index c3a560d..643868f 100644
--- a/chrome/browser/views/importing_progress_view.h
+++ b/chrome/browser/views/importing_progress_view.h
@@ -51,8 +51,6 @@ class ImportingProgressView : public ChromeViews::View,
                         HWND parent_window);
   virtual ~ImportingProgressView();
 
-  void set_window(ChromeViews::Window* window) { window_ = window; }
-
  protected:
   // Overridden from ImporterHost::Observer:
   virtual void ImportItemStarted(ImportItem item);
@@ -66,6 +64,7 @@ class ImportingProgressView : public ChromeViews::View,
   virtual bool IsModal() const;
   virtual std::wstring GetWindowTitle() const;
   virtual bool Cancel();
+  virtual ChromeViews::View* GetContentsView();
 
   // Overridden from ChromeViews::View:
   virtual void GetPreferredSize(CSize *out);
@@ -90,9 +89,6 @@ class ImportingProgressView : public ChromeViews::View,
   scoped_ptr<ChromeViews::Label> label_history_;
   scoped_ptr<ChromeViews::Label> label_cookies_;
 
-  // The window that contains us.
-  ChromeViews::Window* window_;
-
   // The native window that we are parented to. Can be NULL.
   HWND parent_window_;