Move more from Window onto Widget.

views/window/non_client_view.cc

Index: views/window/non_client_view.cc
===================================================================
--- views/window/non_client_view.cc	(revision 88218)
+++ views/window/non_client_view.cc	(working copy)
@@ -60,7 +60,7 @@
 }
 
 void NonClientView::WindowClosing() {
-  client_view_->WindowClosing();
+  client_view_->WidgetClosing();
 }
 
 void NonClientView::UpdateFrame() {
@@ -190,7 +190,7 @@
 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);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -246,7 +246,7 @@
 }
 
 bool NonClientFrameView::ShouldPaintAsActive() const {
-  return GetWindow()->IsActive() || paint_as_active_;
+  return GetWidget()->IsActive() || paint_as_active_;
 }
 
 void NonClientFrameView::GetAccessibleState(ui::AccessibleViewState* state) {