summaryrefslogtreecommitdiffstats
path: root/aura/desktop.h
diff options
context:
space:
mode:
Diffstat (limited to 'aura/desktop.h')
-rw-r--r--aura/desktop.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/aura/desktop.h b/aura/desktop.h
index a894e24..3139cae 100644
--- a/aura/desktop.h
+++ b/aura/desktop.h
@@ -6,7 +6,7 @@
#define AURA_DESKTOP_H_
#pragma once
-#include "aura/window.h"
+#include "aura/root_window.h"
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "ui/gfx/native_widget_types.h"
@@ -23,7 +23,6 @@ namespace aura {
class DesktopHost;
class MouseEvent;
-class Window;
// Desktop is responsible for hosting a set of windows.
class Desktop {
@@ -31,6 +30,12 @@ class Desktop {
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();
@@ -50,7 +55,7 @@ class Desktop {
private:
scoped_refptr<ui::Compositor> compositor_;
- scoped_ptr<Window> window_;
+ scoped_ptr<internal::RootWindow> window_;
DesktopHost* host_;