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, 5 insertions, 2 deletions

diff --git a/chrome/browser/views/importer_lock_view.cc b/chrome/browser/views/importer_lock_view.cc
index 9e4b00e..c48df4c 100644
--- a/chrome/browser/views/importer_lock_view.cc
+++ b/chrome/browser/views/importer_lock_view.cc
@@ -44,8 +44,7 @@ static const int kDefaultWindowWidth = 320;
 static const int kDefaultWindowHeight = 100;
 
 ImporterLockView::ImporterLockView(ImporterHost* host)
-    : dialog_(NULL),
-      description_label_(NULL),
+    : description_label_(NULL),
       importer_host_(host) {
   description_label_ = new ChromeViews::Label(
       l10n_util::GetString(IDS_IMPORTER_LOCK_TEXT));
@@ -97,3 +96,7 @@ bool ImporterLockView::Cancel() {
       importer_host_, &ImporterHost::OnLockViewEnd, false));
   return true;
 }
+
+ChromeViews::View* ImporterLockView::GetContentsView() {
+  return this;
+}