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, 4 deletions

diff --git a/chrome/browser/views/importer_view.h b/chrome/browser/views/importer_view.h
index fe9ab11..cbfd2df 100644
--- a/chrome/browser/views/importer_view.h
+++ b/chrome/browser/views/importer_view.h
@@ -58,8 +58,6 @@ class ImporterView : public ChromeViews::View,
   explicit ImporterView(Profile* profile);
   virtual ~ImporterView();
 
-  void set_dialog(ChromeViews::Window* dialog) { dialog_ = dialog; }
-
   // Overridden from ChromeViews::View.
   virtual void GetPreferredSize(CSize *out);
   virtual void Layout();
@@ -69,6 +67,7 @@ class ImporterView : public ChromeViews::View,
   virtual bool IsModal() const;
   virtual std::wstring GetWindowTitle() const;
   virtual bool Accept();
+  virtual ChromeViews::View* GetContentsView();
 
   // Overridden from ChromeViews::ComboBox::Model.
   virtual int GetItemCount(ChromeViews::ComboBox* source);
@@ -93,8 +92,6 @@ class ImporterView : public ChromeViews::View,
   ChromeViews::CheckBox* passwords_checkbox_;
   ChromeViews::CheckBox* search_engines_checkbox_;
 
-  ChromeViews::Window* dialog_;
-
   scoped_refptr<ImporterHost> importer_host_;
 
   Profile* profile_;