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

diff --git a/chrome/browser/views/first_run_view.cc b/chrome/browser/views/first_run_view.cc
index 1beed44..d230efa 100644
--- a/chrome/browser/views/first_run_view.cc
+++ b/chrome/browser/views/first_run_view.cc
@@ -180,16 +180,10 @@ std::wstring FirstRunView::GetDialogButtonLabel(DialogButton button) const {
 
 void FirstRunView::OpenCustomizeDialog() {
   // The customize dialog now owns the importer host object.
-  FirstRunCustomizeView* customize_view =
-      new FirstRunCustomizeView(profile_, importer_host_);
-
-  ChromeViews::Window* customize_dialog =
-      ChromeViews::Window::CreateChromeWindow(dialog_->GetHWND(),
-                                              gfx::Rect(), customize_view,
-                                              customize_view);
-  customize_dialog->Show();
-  customize_view->set_dialog(customize_dialog);
-  customize_view->set_observer(this);
+  ChromeViews::Window::CreateChromeWindow(
+      window()->GetHWND(),
+      gfx::Rect(),
+      new FirstRunCustomizeView(profile_, importer_host_, this))->Show();
 }
 
 void FirstRunView::LinkActivated(ChromeViews::Link* source, int event_flags) {
@@ -200,6 +194,10 @@ std::wstring FirstRunView::GetWindowTitle() const {
   return l10n_util::GetString(IDS_FIRSTRUN_DLG_TITLE);
 }
 
+ChromeViews::View* FirstRunView::GetContentsView() {
+  return this;
+}
+
 bool FirstRunView::Accept() {
   if (!IsDialogButtonEnabled(DIALOGBUTTON_OK))
     return false;
@@ -210,7 +208,7 @@ bool FirstRunView::Accept() {
   CreateQuickLaunchShortcut();
   // Index 0 is the default browser.
   FirstRun::ImportSettings(profile_, 0, GetDefaultImportItems(),
-                           dialog_->GetHWND());
+                           window()->GetHWND());
   UserMetrics::RecordAction(L"FirstRunDef_Accept", profile_);
 
   return true;
@@ -224,7 +222,7 @@ bool FirstRunView::Cancel() {
 // Notification from the customize dialog that the user accepted. Since all
 // the work is done there we got nothing else to do.
 void FirstRunView::CustomizeAccepted() {
-  dialog_->Close();
+  window()->Close();
 }
 
 // Notification from the customize dialog that the user cancelled.