Move more from Window onto Widget.

views/window/client_view.h

Index: views/window/client_view.h
===================================================================
--- views/window/client_view.h	(revision 88218)
+++ views/window/client_view.h	(working copy)
@@ -11,13 +11,13 @@
 namespace views {
 
 class DialogClientView;
-class Window;
+class Widget;
 
 ///////////////////////////////////////////////////////////////////////////////
 // ClientView
 //
 //  A ClientView is a View subclass that is used to occupy the "client area"
-//  of a window. It provides basic information to the window that contains it
+//  of a widget. It provides basic information to the widget that contains it
 //  such as non-client hit testing information, sizing etc. Sub-classes of
 //  ClientView are used to create more elaborate contents, e.g.
 //  "DialogClientView".
@@ -26,25 +26,25 @@
   // Internal class name
   static const char kViewClassName[];
 
-  // Constructs a ClientView object for the specified window with the specified
+  // Constructs a ClientView object for the specified widget with the specified
   // contents. Since this object is created during the process of creating
-  // |window|, |contents_view| must be valid if you want the initial size of
-  // the window to be based on |contents_view|'s preferred size.
-  ClientView(Window* window, View* contents_view);
+  // |widget|, |contents_view| must be valid if you want the initial size of
+  // the widget to be based on |contents_view|'s preferred size.
+  ClientView(Widget* widget, View* contents_view);
   virtual ~ClientView() {}
 
   // Manual RTTI ftw.
   virtual DialogClientView* AsDialogClientView();
 
-  // Returns true to signal that the Window can be closed. Specialized
+  // Returns true to signal that the Widget can be closed. Specialized
   // ClientView subclasses can override this default behavior to allow the
   // close to be blocked until the user corrects mistakes, accepts a warning
   // dialog, etc.
   virtual bool CanClose();
 
-  // Notification that the window is closing.  The default implementation
+  // Notification that the widget is closing.  The default implementation
   // forwards the notification to the delegate.
-  virtual void WindowClosing();
+  virtual void WidgetClosing();
 
   // Tests to see if the specified point (in view coordinates) is within the
   // bounds of this view. If so, it returns HTCLIENT in this default
@@ -70,16 +70,14 @@
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Accessors for private data members.
-  Window* window() const { return window_; }
-  void set_window(Window* window) { window_ = window; }
   View* contents_view() const { return contents_view_; }
   void set_contents_view(View* contents_view) {
     contents_view_ = contents_view;
   }
 
  private:
-  // The Window that hosts this ClientView.
-  Window* window_;
+  // The Widget that hosts this ClientView.
+  Widget* widget_;
 
   // The View that this ClientView contains.
   View* contents_view_;