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

diff --git a/chrome/browser/task_manager.h b/chrome/browser/task_manager.h
index 3dc89e8..dd5431e 100644
--- a/chrome/browser/task_manager.h
+++ b/chrome/browser/task_manager.h
@@ -150,6 +150,7 @@ class TaskManager : public ChromeViews::DialogDelegate {
                                      bool* always_on_top);
   virtual int GetDialogButtons() const;
   virtual void WindowClosing();
+  virtual ChromeViews::View* GetContentsView();
 
  private:
   // Obtain an instance via GetInstance().
@@ -163,8 +164,6 @@ class TaskManager : public ChromeViews::DialogDelegate {
   // Returns the singleton instance (and initializes it if necessary).
   static TaskManager* GetInstance();
 
-  ChromeViews::Window* window_;
-
   // The model used for the list in the table that displays the list of tab
   // processes. It is ref counted because it is passed as a parameter to
   // MessageLoop::InvokeLater().