Revert 98306 - Create a new views_aura_desktop.

aura/window.h

Index: aura/window.h
===================================================================
--- aura/window.h	(revision 98311)
+++ aura/window.h	(working copy)
@@ -10,6 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 
 class SkCanvas;
@@ -41,17 +42,14 @@
     VISIBILITY_SHOWN_NO_INPUT = 3,
   };
 
-  explicit Window(WindowDelegate* delegate);
+  explicit Window(Desktop* desktop);
   ~Window();
 
-  void Init();
+  void set_delegate(WindowDelegate* d) { delegate_ = d; }
 
   int id() const { return id_; }
   void set_id(int id) { id_ = id; }
 
-  ui::Layer* layer() { return layer_.get(); }
-  const ui::Layer* layer() const { return layer_.get(); }
-
   // Changes the visibility of the window.
   void SetVisibility(Visibility visibility);
   Visibility visibility() const { return visibility_; }
@@ -66,11 +64,6 @@
   // Sets the contents of the window.
   void SetCanvas(const SkCanvas& canvas, const gfx::Point& origin);
 
-  // Sets the parent window of the window. If NULL, the window is parented to
-  // the desktop's window.
-  void SetParent(Window* parent);
-  Window* parent() { return parent_; }
-
   // Draw the window and its children.
   void DrawTree();
 
@@ -79,6 +72,7 @@
   //             should change this.
   void AddChild(Window* child);
   void RemoveChild(Window* child);
+  Window* parent() { return parent_; }
 
   // Handles a mouse event. Returns true if handled.
   bool OnMouseEvent(const MouseEvent& event);