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

Unified Diff: aura/window.h

Issue 7747032: 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/desktop.cc ('k') | aura/window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: aura/window.h
===================================================================
--- aura/window.h (revision 98313)
+++ aura/window.h (working copy)
@@ -10,7 +10,6 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
-#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/rect.h"
class SkCanvas;
@@ -42,14 +41,17 @@
VISIBILITY_SHOWN_NO_INPUT = 3,
};
- explicit Window(Desktop* desktop);
+ explicit Window(WindowDelegate* delegate);
~Window();
- void set_delegate(WindowDelegate* d) { delegate_ = d; }
+ void Init();
int id() const { return id_; }
void set_id(int id) { id_ = id; }
+ ui::Layer* layer() { return layer_.get(); }
+ const ui::Layer* layer() const { return layer_.get(); }
+
// Changes the visibility of the window.
void SetVisibility(Visibility visibility);
Visibility visibility() const { return visibility_; }
@@ -64,6 +66,11 @@
// Sets the contents of the window.
void SetCanvas(const SkCanvas& canvas, const gfx::Point& origin);
+ // Sets the parent window of the window. If NULL, the window is parented to
+ // the desktop's window.
+ void SetParent(Window* parent);
+ Window* parent() { return parent_; }
+
// Draw the window and its children.
void DrawTree();
@@ -72,7 +79,6 @@
// should change this.
void AddChild(Window* child);
void RemoveChild(Window* child);
- Window* parent() { return parent_; }
// Handles a mouse event. Returns true if handled.
bool OnMouseEvent(const MouseEvent& event);
« no previous file with comments | « aura/desktop.cc ('k') | aura/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698