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

diff --git a/chrome/browser/importer.cc b/chrome/browser/importer.cc
index 2053527..f0b2b51 100644
--- a/chrome/browser/importer.cc
+++ b/chrome/browser/importer.cc
@@ -340,12 +340,8 @@ void ImporterHost::Observe(NotificationType type,
 }
 
 void ImporterHost::ShowWarningDialog() {
-  ImporterLockView* view = new ImporterLockView(this);
-  ChromeViews::Window* dialog =
-      ChromeViews::Window::CreateChromeWindow(
-          GetActiveWindow(), gfx::Rect(), view, view);
-  dialog->Show();
-  view->set_dialog(dialog);
+  ChromeViews::Window::CreateChromeWindow(GetActiveWindow(), gfx::Rect(),
+                                          new ImporterLockView(this))->Show();
 }
 
 void ImporterHost::OnLockViewEnd(bool is_continue) {