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

diff --git a/chrome/browser/views/restart_message_box.cc b/chrome/browser/views/restart_message_box.cc
index 3d940ab..d3f52cd 100644
--- a/chrome/browser/views/restart_message_box.cc
+++ b/chrome/browser/views/restart_message_box.cc
@@ -65,19 +65,23 @@ bool RestartMessageBox::IsModal() const {
   return true;
 }
 
+ChromeViews::View* RestartMessageBox::GetContentsView() {
+  return message_box_view_;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // RestartMessageBox, private:
 
 RestartMessageBox::RestartMessageBox(HWND parent_hwnd) {
   const int kDialogWidth = 400;
   // Also deleted when the window closes.
-  MessageBoxView* message_box_view = new MessageBoxView(
+  message_box_view_ = new MessageBoxView(
       MessageBoxView::kFlagHasMessage | MessageBoxView::kFlagHasOKButton,
       l10n_util::GetString(IDS_OPTIONS_RESTART_REQUIRED).c_str(),
       std::wstring(),
       kDialogWidth);
   ChromeViews::Window::CreateChromeWindow(parent_hwnd, gfx::Rect(),
-      message_box_view, this)->Show();
+                                          this)->Show();
 }
 
 RestartMessageBox::~RestartMessageBox() {