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

diff --git a/chrome/views/custom_frame_window.h b/chrome/views/custom_frame_window.h
index 8dab9d9..52356b2 100644
--- a/chrome/views/custom_frame_window.h
+++ b/chrome/views/custom_frame_window.h
@@ -48,9 +48,10 @@ namespace ChromeViews {
 ////////////////////////////////////////////////////////////////////////////////
 class CustomFrameWindow : public Window {
  public:
-  CustomFrameWindow();
+  explicit CustomFrameWindow(WindowDelegate* window_delegate);
   class NonClientView;
-  explicit CustomFrameWindow(NonClientView* non_client_view);
+  CustomFrameWindow(WindowDelegate* window_delegate,
+                    NonClientView* non_client_view);
   virtual ~CustomFrameWindow();
 
   // Create the CustomFrameWindow.
@@ -58,14 +59,7 @@ class CustomFrameWindow : public Window {
   // window that this window is dependent on, if this window is opened as a
   // modal dialog or dependent window. This is NULL if the window is not
   // dependent on any other window.
-  // |contents_view| is the view to be displayed in the client area of the
-  // window.
-  // |window_delegate| is an object implementing the WindowDelegate interface
-  // that supplies information to the window such as its title, icon, etc.
-  virtual void Init(HWND owner,
-                    const gfx::Rect& bounds,
-                    View* contents_view,
-                    WindowDelegate* window_delegate);
+  virtual void Init(HWND owner, const gfx::Rect& bounds);
 
   // Executes the specified SC_command.
   void ExecuteSystemMenuCommand(int command);