Move more from Window onto Widget.

views/window/client_view.cc

 // 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.
 
 #include "base/logging.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "views/window/client_view.h"
 #if defined(OS_LINUX)
 #include "views/window/hit_test.h"
 #endif
-#include "views/window/window.h"
-#include "views/window/window_delegate.h"
+#include "views/widget/widget.h"
+#include "views/widget/widget_delegate.h"
 
 namespace views {
 
 // static
 const char ClientView::kViewClassName[] =
     "views/window/ClientView";
 
 ///////////////////////////////////////////////////////////////////////////////
 // ClientView, public:
 
-ClientView::ClientView(Window* window, View* contents_view)
-    : window_(window),
+ClientView::ClientView(Widget* widget, View* contents_view)
+    : widget_(widget),
       contents_view_(contents_view) {
 }
 
 int ClientView::NonClientHitTest(const gfx::Point& point) {
   return bounds().Contains(point) ? HTCLIENT : HTNOWHERE;
 }
 
 DialogClientView* ClientView::AsDialogClientView() {
   return NULL;
 }
 
 bool ClientView::CanClose() {
   return true;
 }
 
-void ClientView::WindowClosing() {
+void ClientView::WidgetClosing() {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // ClientView, View overrides:
 
 gfx::Size ClientView::GetPreferredSize() {
   // |contents_view_| is allowed to be NULL up until the point where this view
   // is attached to a Container.
   if (contents_view_)
     return contents_view_->GetPreferredSize();
@@ skipping 25 matching lines @@
   // Overridden to do nothing. The NonClientView manually calls Layout on the
   // ClientView when it is itself laid out, see comment in
   // NonClientView::Layout.
 }
 
 void ClientView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_CLIENT;
 }
 
 }  // namespace views