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, 4 insertions, 4 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index aebd7cf..3795b14 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -770,10 +770,10 @@ void Browser::ShowHtmlDialog(HtmlDialogContentsDelegate* delegate,
                              HWND parent_hwnd) {
   parent_hwnd = parent_hwnd ? parent_hwnd : GetTopLevelHWND();
   HtmlDialogView* html_view = new HtmlDialogView(this, profile_, delegate);
-  ChromeViews::Window* html_dialog = ChromeViews::Window::CreateChromeWindow(
-      parent_hwnd, gfx::Rect(), html_view, html_view);
-  html_view->InitDialog(html_dialog);
-  html_dialog->Show();
+  ChromeViews::Window::CreateChromeWindow(parent_hwnd, gfx::Rect(),
+                                          html_view);
+  html_view->InitDialog();
+  html_view->window()->Show();
 }
 
 void Browser::Observe(NotificationType type,