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

diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc
index 2c9ef19..fb449fc 100644
--- a/chrome/browser/views/options/languages_page_view.cc
+++ b/chrome/browser/views/options/languages_page_view.cc
@@ -243,6 +243,7 @@ class AddLanguageWindowView : public ChromeViews::View,
 
   // ChromeViews::WindowDelegate method.
   virtual bool IsModal() const { return true; }
+  virtual ChromeViews::View* GetContentsView() { return this; }
 
   // ChromeViews::ComboBox::Listener implementation:
   virtual void ItemChanged(ChromeViews::ComboBox* combo_box,
@@ -525,12 +526,10 @@ void LanguagesPageView::ButtonPressed(ChromeViews::NativeButton* sender) {
     OnRemoveLanguage();
     language_table_edited_ = true;
   } else if (sender == add_button_) {
-    AddLanguageWindowView* instance = new AddLanguageWindowView(this, profile());
-    HWND parent_hwnd = GetViewContainer()->GetHWND();
-    ChromeViews::Window* w =
-        ChromeViews::Window::CreateChromeWindow(parent_hwnd, gfx::Rect(),
-            instance, instance);
-    w->Show();
+    ChromeViews::Window::CreateChromeWindow(
+        GetViewContainer()->GetHWND(),
+        gfx::Rect(),
+        new AddLanguageWindowView(this, profile()))->Show();
     language_table_edited_ = true;
   }
 }