Move more from Window onto Widget.

views/widget/widget_delegate.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef VIEWS_WIDGET_WIDGET_DELEGATE_H_
 #define VIEWS_WIDGET_WIDGET_DELEGATE_H_
 #pragma once
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/accessibility/accessibility_types.h"
 
 class SkBitmap;
 
 namespace gfx {
 class Rect;
 }
 
 namespace views {
 class ClientView;
 class DialogDelegate;
 class NonClientFrameView;
 class View;
+class Widget;
 class Window;
 
 // WidgetDelegate interface
 // Handles events on Widgets in context-specific ways.
 class WidgetDelegate {
  public:
   WidgetDelegate();
 
   // Called whenever the widget is activated or deactivated.
   // TODO(beng): This should be consolidated with
@@ skipping 95 matching lines @@
   virtual void OnWindowActivationChanged(bool active) {}
 
   // Called when the user begins/ends to change the bounds of the window.
   virtual void OnWindowBeginUserBoundsChange() {}
   virtual void OnWindowEndUserBoundsChange() {}
 
   // Returns the View that is contained within this Window.
   virtual View* GetContentsView();
 
   // Called by the Window to create the Client View used to host the contents
-  // of the window.
-  virtual ClientView* CreateClientView(Window* window);
+  // of the widget.
+  virtual ClientView* CreateClientView(Widget* widget);
 
   // Called by the Widget to create the NonClient Frame View for this widget.
   // Return NULL to use the default one.
   virtual NonClientFrameView* CreateNonClientFrameView();
 
   // Returns true if the window can be notified with the work area change.
   // Otherwise, the work area change for the top window will be processed by
   // the default window manager. In some cases, like panel, we would like to
   // manage the positions by ourselves.
   virtual bool WillProcessWorkAreaChange() const;
 
   Window* window() const { return window_; }
 
  protected:
   virtual ~WidgetDelegate() {}
 
  private:
   friend class Window;
   // The Window this delegate is bound to. Weak reference.
   Window* window_;
 };
 
 }  // namespace views
 
 #endif  // VIEWS_WIDGET_WIDGET_DELEGATE_H_