From ddf5ff7b90b443c64c124f328cbc5b2f133de601 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Tue, 30 Aug 2011 18:32:33 +0000 Subject: Proper MouseEvent targeting. Adds a Window method that locates a Window for a given point. Also adds an Aura test suite. http://crbug.com/93933 http://crbug.com/93943 TEST=see unittest Review URL: http://codereview.chromium.org/7791030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98850 0039d316-1c4b-4281-b951-d872f2087c98 --- aura/desktop.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'aura/desktop.h') 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 compositor_; - scoped_ptr window_; + scoped_ptr window_; DesktopHost* host_; -- cgit v1.1