Revert 98306 - Create a new views_aura_desktop.

Get views::Widget rendering working against an aura::Window NativeWidget.

http://crbug.com/93944
TEST=none
Review URL: http://codereview.chromium.org/7741027

TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/7749020

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

1 files changed, 1 insertions, 11 deletions

diff --git a/aura/desktop.h b/aura/desktop.h
index a894e24..1eb89ca 100644
--- a/aura/desktop.h
+++ b/aura/desktop.h
@@ -21,19 +21,15 @@ class Compositor;
 
 namespace aura {
 
-class DesktopHost;
 class MouseEvent;
 class Window;
 
 // Desktop is responsible for hosting a set of windows.
 class Desktop {
  public:
-  Desktop();
+  Desktop(gfx::AcceleratedWidget widget, const gfx::Size& size);
   ~Desktop();
 
-  // Shows the desktop host and runs an event loop for it.
-  void Run();
-
   // Draws the necessary set of windows.
   void Draw();
 
@@ -45,17 +41,11 @@ class Desktop {
 
   Window* window() { return window_.get(); }
 
-  static Desktop* GetInstance();
-
  private:
   scoped_refptr<ui::Compositor> compositor_;
 
   scoped_ptr<Window> window_;
 
-  DesktopHost* host_;
-
-  static Desktop* instance_;
-
   DISALLOW_COPY_AND_ASSIGN(Desktop);
 };