Move more from Window onto Widget.

views/widget/native_widget_views.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/native_widget_views.h"
 
 #include "views/view.h"
 #include "views/widget/native_widget_view.h"
 
 namespace views {
@@ skipping 62 matching lines @@
 
 gfx::NativeView NativeWidgetViews::GetNativeView() const {
   return GetParentNativeWidget()->GetNativeView();
 }
 
 gfx::NativeWindow NativeWidgetViews::GetNativeWindow() const {
   return GetParentNativeWidget()->GetNativeWindow();
 }
 
 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) {
   return GetParentNativeWidget()->ViewRemoved(view);
 }
 
 void NativeWidgetViews::SetNativeWindowProperty(const char* name, void* value) {
   NOTIMPLEMENTED();
 }
 
@@ skipping 78 matching lines @@
 gfx::Rect NativeWidgetViews::GetWindowScreenBounds() const {
   gfx::Point origin = view_->bounds().origin();
   View::ConvertPointToScreen(view_->parent(), &origin);
   return gfx::Rect(origin.x(), origin.y(), view_->width(), view_->height());
 }
 
 gfx::Rect NativeWidgetViews::GetClientAreaScreenBounds() const {
   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);
 }
 
 void NativeWidgetViews::SetSize(const gfx::Size& size) {
   view_->SetSize(size);
 }
 
 void NativeWidgetViews::SetBoundsConstrained(const gfx::Rect& bounds,
@@ skipping 16 matching lines @@
     MessageLoop::current()->PostTask(FROM_HERE,
         close_widget_factory_.NewRunnableMethod(&NativeWidgetViews::CloseNow));
   }
 }
 
 void NativeWidgetViews::CloseNow() {
   view_->parent()->RemoveChildView(view_);
   delete view_;
 }
 
+void NativeWidgetViews::EnableClose(bool enable) {
+}
+
 void NativeWidgetViews::Show() {
   view_->SetVisible(true);
 }
 
 void NativeWidgetViews::Hide() {
   view_->SetVisible(false);
 }
 
+void NativeWidgetViews::ShowNativeWidget(ShowState state) {
+}
+
 bool NativeWidgetViews::IsVisible() const {
   return view_->IsVisible();
 }
 
 void NativeWidgetViews::Activate() {
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetViews::Deactivate() {
   NOTIMPLEMENTED();
@@ skipping 76 matching lines @@
 NativeWidget* NativeWidgetViews::GetParentNativeWidget() {
   return view_->GetWidget()->native_widget();
 }
 
 const NativeWidget* NativeWidgetViews::GetParentNativeWidget() const {
   return view_->GetWidget()->native_widget();
 }
 
 }  // namespace views