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

Unified Diff: aura/desktop.h

Issue 7749020: Revert 98306 - Create a new views_aura_desktop. (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 98311)
+++ aura/desktop.h (working copy)
@@ -21,19 +21,15 @@
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 @@
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);
};
« 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