Move more from Window onto Widget.

views/widget/native_widget_views.cc

Index: views/widget/native_widget_views.cc
===================================================================
--- views/widget/native_widget_views.cc	(revision 88218)
+++ views/widget/native_widget_views.cc	(working copy)
@@ -80,11 +80,11 @@
 }
 
 Window* NativeWidgetViews::GetContainingWindow() {
-  return view_->GetWindow();
+  return view_->GetWidget()->AsWindow();
 }
 
 const Window* NativeWidgetViews::GetContainingWindow() const {
-  return view_->GetWindow();
+  return view_->GetWidget()->AsWindow();
 }
 
 void NativeWidgetViews::ViewRemoved(View* view) {
@@ -183,6 +183,10 @@
   return GetWindowScreenBounds();
 }
 
+gfx::Rect NativeWidgetViews::GetRestoredBounds() const {
+  return GetWindowScreenBounds();
+}
+
 void NativeWidgetViews::SetBounds(const gfx::Rect& bounds) {
   // |bounds| are supplied in the coordinates of the parent.
   view_->SetBoundsRect(bounds);
@@ -219,6 +223,9 @@
   delete view_;
 }
 
+void NativeWidgetViews::EnableClose(bool enable) {
+}
+
 void NativeWidgetViews::Show() {
   view_->SetVisible(true);
 }
@@ -227,6 +234,9 @@
   view_->SetVisible(false);
 }
 
+void NativeWidgetViews::ShowNativeWidget(ShowState state) {
+}
+
 bool NativeWidgetViews::IsVisible() const {
   return view_->IsVisible();
 }