Eliminate Window completely.

BUG=72040
TEST=none
Review URL: http://codereview.chromium.org/7108047

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88905 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 39 insertions, 36 deletions

diff --git a/views/desktop/desktop_views_delegate.cc b/views/desktop/desktop_views_delegate.cc
index 00a2014..98adee5 100644
--- a/views/desktop/desktop_views_delegate.cc
+++ b/views/desktop/desktop_views_delegate.cc
@@ -27,21 +27,22 @@ ui::Clipboard* DesktopViewsDelegate::GetClipboard() const {
   return NULL;
 }
 
-void DesktopViewsDelegate::SaveWindowPlacement(views::Window* window,
-                                   const std::wstring& window_name,
-                                   const gfx::Rect& bounds,
-                                   bool maximized) {
+void DesktopViewsDelegate::SaveWindowPlacement(const Widget* widget,
+                                               const std::wstring& window_name,
+                                               const gfx::Rect& bounds,
+                                               bool maximized) {
 }
 
-bool DesktopViewsDelegate::GetSavedWindowBounds(views::Window* window,
+bool DesktopViewsDelegate::GetSavedWindowBounds(const Widget* widget,
                                                 const std::wstring& window_name,
                                                 gfx::Rect* bounds) const {
   return false;
 }
 
-bool DesktopViewsDelegate::GetSavedMaximizedState(views::Window* window,
-                                      const std::wstring& window_name,
-                                      bool* maximized) const {
+bool DesktopViewsDelegate::GetSavedMaximizedState(
+    const Widget* widget,
+    const std::wstring& window_name,
+    bool* maximized) const {
   return false;
 }
 
diff --git a/views/desktop/desktop_views_delegate.h b/views/desktop/desktop_views_delegate.h
index fdc2fe0..cf7fa3d 100644
--- a/views/desktop/desktop_views_delegate.h
+++ b/views/desktop/desktop_views_delegate.h
@@ -19,14 +19,14 @@ class DesktopViewsDelegate : public ViewsDelegate {
  private:
   // Overridden from ViewsDelegate:
   virtual ui::Clipboard* GetClipboard() const OVERRIDE;
-  virtual void SaveWindowPlacement(views::Window* window,
+  virtual void SaveWindowPlacement(const Widget* widget,
                                    const std::wstring& window_name,
                                    const gfx::Rect& bounds,
                                    bool maximized) OVERRIDE;
-  virtual bool GetSavedWindowBounds(views::Window* window,
+  virtual bool GetSavedWindowBounds(const Widget* widget,
                                     const std::wstring& window_name,
                                     gfx::Rect* bounds) const OVERRIDE;
-  virtual bool GetSavedMaximizedState(views::Window* window,
+  virtual bool GetSavedMaximizedState(const Widget* widget,
                                       const std::wstring& window_name,
                                       bool* maximized) const OVERRIDE;
   virtual void NotifyAccessibilityEvent(
diff --git a/views/desktop/desktop_window.cc b/views/desktop/desktop_window.cc
index b59fc5d..c0999fb 100644
--- a/views/desktop/desktop_window.cc
+++ b/views/desktop/desktop_window.cc
@@ -9,20 +9,20 @@
 #include "views/desktop/desktop_background.h"
 #include "views/desktop/desktop_window_root_view.h"
 #include "views/widget/native_widget_view.h"
-#include "views/window/native_window_views.h"
-#include "views/window/window.h"
+#include "views/widget/native_widget_views.h"
+#include "views/widget/widget.h"
 
 #if defined(OS_WIN)
-#include "views/window/native_window_win.h"
+#include "views/widget/native_widget_win.h"
 #elif defined(TOOLKIT_USES_GTK)
-#include "views/window/native_window_gtk.h"
+#include "views/widget/native_widget_gtk.h"
 #endif
 
 namespace views {
 namespace desktop {
 
 // TODO(beng): resolve naming!
-class DesktopWindowWindow : public Window {
+class DesktopWindowWindow : public Widget {
  public:
   explicit DesktopWindowWindow(DesktopWindow* desktop_window)
       : desktop_window_(desktop_window) {}
@@ -40,7 +40,7 @@ class DesktopWindowWindow : public Window {
 };
 
 class TestWindowContentView : public View,
-                              public WindowDelegate {
+                              public WidgetDelegate {
  public:
   TestWindowContentView(const std::wstring& title, SkColor color)
       : title_(title),
@@ -81,18 +81,19 @@ DesktopWindow::~DesktopWindow() {
 // static
 void DesktopWindow::CreateDesktopWindow() {
   DesktopWindow* desktop = new DesktopWindow;
-  views::Window* window = new DesktopWindowWindow(desktop);
-  views::Window::InitParams params(desktop);
+  views::Widget* window = new DesktopWindowWindow(desktop);
+  views::Widget::InitParams params;
+  params.delegate = desktop;
   // In this environment, CreateChromeWindow will default to creating a views-
-  // window, so we need to construct a NativeWindowWin by hand.
+  // window, so we need to construct a NativeWidgetWin by hand.
   // TODO(beng): Replace this with NativeWindow::CreateNativeRootWindow().
 #if defined(OS_WIN)
-  params.native_window = new views::NativeWindowWin(window);
+  params.native_widget = new views::NativeWidgetWin(window);
 #elif defined(TOOLKIT_USES_GTK)
-  params.native_window = new views::NativeWindowGtk(window);
+  params.native_widget = new views::NativeWidgetGtk(window);
 #endif
-  params.widget_init_params.bounds = gfx::Rect(20, 20, 1920, 1200);
-  window->InitWindow(params);
+  params.bounds = gfx::Rect(20, 20, 1920, 1200);
+  window->Init(params);
   window->Show();
 
   desktop->CreateTestWindow(L"Sample Window 1", SK_ColorWHITE,
@@ -161,12 +162,13 @@ void DesktopWindow::CreateTestWindow(const std::wstring& title,
                                      SkColor color,
                                      gfx::Rect initial_bounds,
                                      bool rotate) {
-  views::Window* window = new views::Window;
-  views::NativeWindowViews* nwv = new views::NativeWindowViews(this, window);
-  views::Window::InitParams params(new TestWindowContentView(title, color));
-  params.native_window = nwv;
-  params.widget_init_params.bounds = initial_bounds;
-  window->InitWindow(params);
+  views::Widget* window = new views::Widget;
+  views::NativeWidgetViews* nwv = new views::NativeWidgetViews(this, window);
+  views::Widget::InitParams params;
+  params.delegate = new TestWindowContentView(title, color);
+  params.native_widget = nwv;
+  params.bounds = initial_bounds;
+  window->Init(params);
   window->Show();
 
   if (rotate) {
diff --git a/views/desktop/desktop_window.h b/views/desktop/desktop_window.h
index 8cd943a..453030c 100644
--- a/views/desktop/desktop_window.h
+++ b/views/desktop/desktop_window.h
@@ -6,7 +6,7 @@
 #define VIEWS_DESKTOP_DESKTOP_WINDOW_H_
 
 #include "views/view.h"
-#include "views/window/window_delegate.h"
+#include "views/widget/widget_delegate.h"
 
 namespace views {
 class NativeWidgetViews;
@@ -14,7 +14,7 @@ class NativeWidgetViews;
 namespace desktop {
 
 class DesktopWindow : public View,
-                      public WindowDelegate {
+                      public WidgetDelegate {
  public:
    DesktopWindow();
    virtual ~DesktopWindow();
@@ -29,7 +29,7 @@ class DesktopWindow : public View,
   // Overridden from View:
   virtual void Layout() OVERRIDE;
 
-  // Overridden from WindowDelegate:
+  // Overridden from WidgetDelegate:
   virtual bool CanResize() const OVERRIDE;
   virtual bool CanMaximize() const OVERRIDE;
   virtual std::wstring GetWindowTitle() const OVERRIDE;
diff --git a/views/desktop/desktop_window_root_view.cc b/views/desktop/desktop_window_root_view.cc
index 5639cb5..fec23fb 100644
--- a/views/desktop/desktop_window_root_view.cc
+++ b/views/desktop/desktop_window_root_view.cc
@@ -6,7 +6,7 @@
 
 #include "views/desktop/desktop_window.h"
 #include "views/widget/native_widget_view.h"
-#include "views/window/window.h"
+#include "views/widget/widget.h"
 
 namespace views {
 namespace desktop {
@@ -15,7 +15,7 @@ namespace desktop {
 // DesktopWindowRootView, public:
 
 DesktopWindowRootView::DesktopWindowRootView(DesktopWindow* desktop_window,
-                                             Window* window)
+                                             Widget* window)
     : internal::RootView(window),
       desktop_window_(desktop_window) {
 }
diff --git a/views/desktop/desktop_window_root_view.h b/views/desktop/desktop_window_root_view.h
index 9ad5f1c..1896942 100644
--- a/views/desktop/desktop_window_root_view.h
+++ b/views/desktop/desktop_window_root_view.h
@@ -14,7 +14,7 @@ class DesktopWindow;
 
 class DesktopWindowRootView : public internal::RootView {
  public:
-  DesktopWindowRootView(DesktopWindow* desktop_window, Window* window);
+  DesktopWindowRootView(DesktopWindow* desktop_window, Widget* window);
   virtual ~DesktopWindowRootView();
 
  private: