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

diff --git a/chrome/browser/views/importer_view.cc b/chrome/browser/views/importer_view.cc
index bd71637..cd875ea 100644
--- a/chrome/browser/views/importer_view.cc
+++ b/chrome/browser/views/importer_view.cc
@@ -44,8 +44,7 @@ using ChromeViews::ColumnSet;
 using ChromeViews::GridLayout;
 
 ImporterView::ImporterView(Profile* profile)
-    : dialog_(NULL),
-      import_from_label_(NULL),
+    : import_from_label_(NULL),
       profile_combobox_(NULL),
       import_items_label_(NULL),
       history_checkbox_(NULL),
@@ -169,6 +168,10 @@ bool ImporterView::Accept() {
   return false;
 }
 
+ChromeViews::View* ImporterView::GetContentsView() {
+  return this;
+}
+
 int ImporterView::GetItemCount(ChromeViews::ComboBox* source) {
   DCHECK(source == profile_combobox_);
   DCHECK(importer_host_.get());
@@ -188,7 +191,7 @@ void ImporterView::ImportCanceled() {
 
 void ImporterView::ImportComplete() {
   // Now close this window since the import completed or was canceled.
-  dialog_->Close();
+  window()->Close();
 }
 
 ChromeViews::CheckBox* ImporterView::InitCheckbox(