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, 3 insertions, 6 deletions

diff --git a/chrome/browser/views/first_run_view_base.cc b/chrome/browser/views/first_run_view_base.cc
index b9c04fe..4ee8aceb 100644
--- a/chrome/browser/views/first_run_view_base.cc
+++ b/chrome/browser/views/first_run_view_base.cc
@@ -54,8 +54,7 @@
 #include "generated_resources.h"
 
 FirstRunViewBase::FirstRunViewBase(Profile* profile)
-    : dialog_(NULL),
-      preferred_width_(0),
+    : preferred_width_(0),
       background_image_(NULL),
       separator_1_(NULL),
       separator_2_(NULL),
@@ -148,9 +147,7 @@ void FirstRunViewBase::Layout() {
                      background_image_->GetHeight() - 2;
 
   separator_1_->GetPreferredSize(&pref_size);
-  separator_1_->SetBounds(0, next_v_space,
-                          canvas.cx + 1,
-                          pref_size.cy);
+  separator_1_->SetBounds(0 , next_v_space, canvas.cx + 1, pref_size.cy);
 
   next_v_space = canvas.cy - kPanelSubVerticalSpacing;
   separator_2_->GetPreferredSize(&pref_size);
@@ -182,7 +179,7 @@ int FirstRunViewBase::GetDefaultImportItems() const {
 };
 
 void FirstRunViewBase::DisableButtons() {
-  dialog_->EnableClose(false);
+  window()->EnableClose(false);
   ChromeViews::ClientView* cv =
       reinterpret_cast<ChromeViews::ClientView*>(GetParent());
   if (cv) {