Move more from Window onto Widget.

views/widget/widget_delegate.cc

Index: views/widget/widget_delegate.cc
===================================================================
--- views/widget/widget_delegate.cc	(revision 88218)
+++ views/widget/widget_delegate.cc	(working copy)
@@ -99,7 +99,6 @@
 
 void WidgetDelegate::SaveWindowPlacement(const gfx::Rect& bounds,
                                          bool maximized) {
-  DCHECK(window_);
   std::wstring window_name = GetWindowName();
   if (!ViewsDelegate::views_delegate || window_name.empty())
     return;
@@ -133,11 +132,11 @@
 }
 
 View* WidgetDelegate::GetContentsView() {
-  return NULL;
+  return new View;
 }
 
-ClientView* WidgetDelegate::CreateClientView(Window* window) {
-  return new ClientView(window, GetContentsView());
+ClientView* WidgetDelegate::CreateClientView(Widget* widget) {
+  return new ClientView(widget, GetContentsView());
 }
 
 NonClientFrameView* WidgetDelegate::CreateNonClientFrameView() {