Move dialog-specific aspects of ClientView into a new subclass DialogClientView.

ClientView becomes a generic representation of the View that occupies the "client area" of a window. All Windows now require a Client View (though they can use the default).

Adjust WindowDelegate to provide a method for constructing the ClientView for a Window. The DialogDelegate overrides this to construct the DialogClientView. In the future, other specialized delegates will construct ClientViews specific to them, e.g. WizardDelegate would construct WizardClientView.

Adjust the Window Init method to set up this new required Client View, and make some tweaks to CustomFrameWindow to make all this work.

Remove all traces of dialog specific handling in Window into DialogClientView.

B=1280060

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

1 files changed, 6 insertions, 3 deletions

diff --git a/chrome/browser/views/constrained_window_impl.h b/chrome/browser/views/constrained_window_impl.h
index 9e8c0b3..31a6d04 100644
--- a/chrome/browser/views/constrained_window_impl.h
+++ b/chrome/browser/views/constrained_window_impl.h
@@ -32,12 +32,15 @@
 
 #include "chrome/browser/constrained_window.h"
 #include "chrome/browser/tab_contents_delegate.h"
-#include "chrome/views/client_view.h"
 #include "chrome/views/custom_frame_window.h"
 
 class ConstrainedTabContentsWindowDelegate;
 class ConstrainedWindowAnimation;
 class ConstrainedWindowNonClientView;
+namespace ChromeViews {
+class HWNDView;
+class WindowDelegate;
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 // ConstrainedWindowImpl
@@ -123,6 +126,8 @@ class ConstrainedWindowImpl : public ConstrainedWindow,
   virtual void OnWindowPosChanged(WINDOWPOS* window_pos);
 
  private:
+  friend class ConstrainedWindow;
+
   // Use the static factory methods on ConstrainedWindow to construct a
   // ConstrainedWindow.
   ConstrainedWindowImpl(TabContents* owner,
@@ -132,8 +137,6 @@ class ConstrainedWindowImpl : public ConstrainedWindow,
                         ChromeViews::WindowDelegate* window_delegate);
   void Init(TabContents* owner);
 
-  friend class ConstrainedWindow;
-
   // Called after changing either the anchor point or titlebar
   // visibility of a suppressed popup. This does the actual resizing.
   //