Move more from Window onto Widget.

views/window/non_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 "views/window/non_client_view.h"
 
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/window/client_view.h"
@@ skipping 42 matching lines @@
   frame_view_.reset(frame_view);
   if (parent())
     AddChildViewAt(frame_view_.get(), kFrameViewIndex);
 }
 
 bool NonClientView::CanClose() {
   return client_view_->CanClose();
 }
 
 void NonClientView::WindowClosing() {
-  client_view_->WindowClosing();
+  client_view_->WidgetClosing();
 }
 
 void NonClientView::UpdateFrame() {
   Widget* widget = GetWidget();
   SetFrameView(widget->CreateNonClientFrameView());
   widget->ThemeChanged();
   Layout();
   SchedulePaint();
   widget->UpdateFrameAfterFrameChange();
 }
@@ skipping 109 matching lines @@
 
   return View::GetEventHandlerForPoint(point);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientFrameView, View overrides:
 
 bool NonClientFrameView::HitTest(const gfx::Point& l) const {
   // For the default case, we assume the non-client frame view never overlaps
   // the client view.
-  return !GetWindow()->client_view()->bounds().Contains(l);
+  return !GetWidget()->client_view()->bounds().Contains(l);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientFrameView, protected:
 
 int NonClientFrameView::GetHTComponentForFrame(const gfx::Point& point,
                                                int top_resize_border_height,
                                                int resize_border_thickness,
                                                int top_resize_corner_height,
                                                int resize_corner_width,
@@ skipping 35 matching lines @@
   } else {
     return HTNOWHERE;
   }
 
   // If the window can't be resized, there are no resize boundaries, just
   // window borders.
   return can_resize ? component : HTBORDER;
 }
 
 bool NonClientFrameView::ShouldPaintAsActive() const {
-  return GetWindow()->IsActive() || paint_as_active_;
+  return GetWidget()->IsActive() || paint_as_active_;
 }
 
 void NonClientFrameView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_WINDOW;
 }
 
 std::string NonClientFrameView::GetClassName() const {
   return kViewClassName;
 }
 
 void NonClientFrameView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   // Overridden to do nothing. The NonClientView manually calls Layout on the
   // FrameView when it is itself laid out, see comment in NonClientView::Layout.
 }
 
 }  // namespace views