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

diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc
index 413f91c..8fe9b00 100644
--- a/chrome/browser/views/edit_keyword_controller.cc
+++ b/chrome/browser/views/edit_keyword_controller.cc
@@ -78,13 +78,10 @@ EditKeywordController::EditKeywordController(
 void EditKeywordController::Show() {
   // Window interprets an empty rectangle as needing to query the content for
   // the size as well as centering relative to the parent.
-  window_ = ChromeViews::Window::CreateChromeWindow(
-      ::IsWindow(parent_) ? parent_ : NULL,
-      gfx::Rect(),
-      view_,
-      this);
-  window_->Show();
-  window_->UpdateDialogButtons();
+  ChromeViews::Window::CreateChromeWindow(::IsWindow(parent_) ? parent_ : NULL,
+                                          gfx::Rect(), this); 
+  window()->Show();
+  window()->UpdateDialogButtons();
   title_tf_->SelectAll();
   title_tf_->RequestFocus();
 }
@@ -180,9 +177,13 @@ bool EditKeywordController::Accept() {
   return true;
 }
 
+ChromeViews::View* EditKeywordController::GetContentsView() {
+  return view_;
+}
+
 void EditKeywordController::ContentsChanged(TextField* sender,
                                             const std::wstring& new_contents) {
-  window_->UpdateDialogButtons();
+  window()->UpdateDialogButtons();
   UpdateImageViews();
 }