Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(172)

Unified Diff: aura/desktop.h

Issue 7739002: Revert 98850 - Proper MouseEvent targeting. Adds a Window method that locates a Window for a give... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « aura/demo/demo_main.cc ('k') | aura/desktop.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « aura/demo/demo_main.cc ('k') | aura/desktop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698