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, 1 insertions, 3 deletions

diff --git a/chrome/browser/views/edit_keyword_controller.h b/chrome/browser/views/edit_keyword_controller.h
index c7e362e..1050d99 100644
--- a/chrome/browser/views/edit_keyword_controller.h
+++ b/chrome/browser/views/edit_keyword_controller.h
@@ -74,6 +74,7 @@ class EditKeywordController : public ChromeViews::TextField::Controller,
   virtual void WindowClosing();
   virtual bool Cancel();
   virtual bool Accept();
+  virtual ChromeViews::View* GetContentsView();
 
   // ChromeViews::TextField::Controller overrides. Updates whether the user can
   // accept the dialog as well as updating image views showing whether value is
@@ -142,9 +143,6 @@ class EditKeywordController : public ChromeViews::TextField::Controller,
   // Profile whose TemplateURLModel we're modifying.
   Profile* profile_;
 
-  // Container for displaying the contents.
-  ChromeViews::Window* window_;
-
   // Text fields.
   ChromeViews::TextField* title_tf_;
   ChromeViews::TextField* keyword_tf_;