Revert 98306 - Create a new views_aura_desktop.

aura/window.h

 // 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.
 
 #ifndef AURA_WINDOW_H_
 #define AURA_WINDOW_H_
 #pragma once
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 
 class SkCanvas;
 
 namespace ui {
 class Compositor;
 class Layer;
 }
 
 namespace aura {
@@ skipping 11 matching lines @@
     // events. This is the default.
     VISIBILITY_HIDDEN = 1,
 
     // Display the window and let it receive mouse events.
     VISIBILITY_SHOWN = 2,
 
     // Display the window but prevent it from receiving mouse events.
     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_; }
 
   // Changes the bounds of the window.
   void SetBounds(const gfx::Rect& bounds, int anim_ms);
   const gfx::Rect& bounds() const { return bounds_; }
 
   // Marks the window as needing to be painted.
   void SchedulePaint(const gfx::Rect& bounds);
 
   // 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();
 
   // Tree operations.
   // TODO(beng): Child windows are currently not owned by the hierarchy. We
   //             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);
 
  private:
   typedef std::vector<Window*> Windows;
 
   // If SchedulePaint has been invoked on the Window the delegate is notified.
   void UpdateLayerCanvas();
 
@@ skipping 25 matching lines @@
   Windows children_;
 
   int id_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace aura
 
 #endif  // AURA_WINDOW_H_