| Index: aura/desktop.h
|
| ===================================================================
|
| --- aura/desktop.h (revision 98850)
|
| +++ aura/desktop.h (working copy)
|
| @@ -6,7 +6,7 @@
|
| #define AURA_DESKTOP_H_
|
| #pragma once
|
|
|
| -#include "aura/root_window.h"
|
| +#include "aura/window.h"
|
| #include "base/basictypes.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| @@ -23,6 +23,7 @@
|
|
|
| class DesktopHost;
|
| class MouseEvent;
|
| +class Window;
|
|
|
| // Desktop is responsible for hosting a set of windows.
|
| class Desktop {
|
| @@ -30,12 +31,6 @@
|
| Desktop();
|
| ~Desktop();
|
|
|
| - // Shows the desktop host.
|
| - void Show();
|
| -
|
| - // Sets the size of the desktop.
|
| - void SetSize(const gfx::Size& size);
|
| -
|
| // Shows the desktop host and runs an event loop for it.
|
| void Run();
|
|
|
| @@ -55,7 +50,7 @@
|
| private:
|
| scoped_refptr<ui::Compositor> compositor_;
|
|
|
| - scoped_ptr<internal::RootWindow> window_;
|
| + scoped_ptr<Window> window_;
|
|
|
| DesktopHost* host_;
|
|
|
|
|