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, 26 insertions, 0 deletions

diff --git a/chrome/views/dialog_delegate.h b/chrome/views/dialog_delegate.h
index 2dc48e6..9ca4ade 100644
--- a/chrome/views/dialog_delegate.h
+++ b/chrome/views/dialog_delegate.h
@@ -30,6 +30,7 @@
 #ifndef CHROME_VIEWS_DIALOG_DELEGATE_H__
 #define CHROME_VIEWS_DIALOG_DELEGATE_H__
 
+#include "chrome/views/dialog_client_view.h"
 #include "chrome/views/window_delegate.h"
 
 namespace ChromeViews {
@@ -119,6 +120,31 @@ class DialogDelegate : public WindowDelegate {
   // instead.
   virtual bool Accept(bool window_closing) { return Accept(); }
   virtual bool Accept() { return true; }
+
+  // Overridden from WindowDelegate:
+  virtual View* GetInitiallyFocusedView() const {
+    // Try to focus the OK then the Cancel button if present.
+    DialogClientView* dcv = GetDialogClientView();
+    if (GetDialogButtons() & DIALOGBUTTON_OK)
+      return dcv->ok_button();
+    if (GetDialogButtons() & DIALOGBUTTON_CANCEL)
+      return dcv->cancel_button();
+    return NULL;
+  }
+
+  // Overridden from WindowDelegate:
+  virtual ClientView* CreateClientView(Window* window) {
+    return new DialogClientView(window, GetContentsView());
+  }
+
+  // A helper for accessing the DialogClientView object contained by this
+  // delegate's Window.
+  DialogClientView* GetDialogClientView() const {
+    ClientView* client_view = window()->client_view();
+    DialogClientView* dialog_client_view = client_view->AsDialogClientView();
+    DCHECK(dialog_client_view);
+    return dialog_client_view;
+  }
 };
 
 }  // namespace ChromeViews