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

diff --git a/chrome/browser/user_data_dir_dialog.h b/chrome/browser/user_data_dir_dialog.h
index eca34e5..ce1bff5 100644
--- a/chrome/browser/user_data_dir_dialog.h
+++ b/chrome/browser/user_data_dir_dialog.h
@@ -67,6 +67,7 @@ class UserDataDirDialog : public ChromeViews::DialogDelegate,
   // ChromeViews::WindowDelegate Methods:
   virtual bool IsAlwaysOnTop() const { return false; }
   virtual bool IsModal() const { return false; }
+  virtual ChromeViews::View* GetContentsView();
 
   // MessageLoop::Dispatcher Method:
   virtual bool Dispatch(const MSG& msg);
@@ -82,7 +83,6 @@ class UserDataDirDialog : public ChromeViews::DialogDelegate,
   std::wstring user_data_dir_;
 
   MessageBoxView* message_box_view_;
-  ChromeViews::Window* message_box_window_;
   scoped_refptr<SelectFileDialog> select_file_dialog_;
 
   // Used to keep track of whether or not to block the message loop (still