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

diff --git a/chrome/browser/jsmessage_box_handler.cc b/chrome/browser/jsmessage_box_handler.cc
index d3dacd8..1576a21 100644
--- a/chrome/browser/jsmessage_box_handler.cc
+++ b/chrome/browser/jsmessage_box_handler.cc
@@ -146,8 +146,8 @@ void JavascriptMessageBoxHandler::ShowModalDialog() {
 
   web_contents_->Activate();
   HWND root_hwnd = GetAncestor(web_contents_->GetHWND(), GA_ROOT);
-  dialog_ = ChromeViews::Window::CreateChromeWindow(root_hwnd, gfx::Rect(),
-                                                    message_box_view_, this);
+  dialog_ =
+      ChromeViews::Window::CreateChromeWindow(root_hwnd, gfx::Rect(), this);
   dialog_->Show();
 }
 
@@ -160,6 +160,13 @@ void JavascriptMessageBoxHandler::ActivateModalDialog() {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
+// JavascriptMessageBoxHandler, ChromeViews::WindowDelegate implementation:
+
+ChromeViews::View* JavascriptMessageBoxHandler::GetContentsView() {
+  return message_box_view_;
+}
+
+///////////////////////////////////////////////////////////////////////////////
 // JavascriptMessageBoxHandler, private:
 
 void JavascriptMessageBoxHandler::Observe(NotificationType type,