Move more from Window onto Widget.

views/widget/widget_delegate.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/widget/widget_delegate.h"
 
 #include "views/view.h"
 #include "views/views_delegate.h"
 #include "views/window/client_view.h"
 #include "views/window/window.h"
@@ skipping 81 matching lines @@
 bool WidgetDelegate::ExecuteWindowsCommand(int command_id) {
   return false;
 }
 
 std::wstring WidgetDelegate::GetWindowName() const {
   return std::wstring();
 }
 
 void WidgetDelegate::SaveWindowPlacement(const gfx::Rect& bounds,
                                          bool maximized) {
-  DCHECK(window_);
   std::wstring window_name = GetWindowName();
   if (!ViewsDelegate::views_delegate || window_name.empty())
     return;
 
   ViewsDelegate::views_delegate->SaveWindowPlacement(
       window_, window_name, bounds, maximized);
 }
 
 bool WidgetDelegate::GetSavedWindowBounds(gfx::Rect* bounds) const {
   DCHECK(window_);
@@ skipping 13 matching lines @@
 
   return ViewsDelegate::views_delegate->GetSavedMaximizedState(
       window_, window_name, maximized);
 }
 
 bool WidgetDelegate::ShouldRestoreWindowSize() const {
   return true;
 }
 
 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() {
   return NULL;
 }
 
 bool WidgetDelegate::WillProcessWorkAreaChange() const {
   return false;
 }
 
 }  // namespace views