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

Unified Diff: ui/aura/window.h

Issue 7980023: Fixes aura unit tests. There were a couple of problems: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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 | « ui/aura/toplevel_window_event_filter.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window.h
diff --git a/ui/aura/window.h b/ui/aura/window.h
index a0221c4ca5278411b4ee935f114ee2f374e7c346..15573f412bdcbace9d99980d51b9d8e860c49486 100644
--- a/ui/aura/window.h
+++ b/ui/aura/window.h
@@ -40,6 +40,8 @@ class FocusManager;
// TODO(beng): resolve ownership.
class AURA_EXPORT Window : public ui::LayerDelegate {
public:
+ typedef std::vector<Window*> Windows;
+
enum Visibility {
// Don't display the window onscreen and don't let it receive mouse
// events. This is the default.
@@ -102,6 +104,8 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
void AddChild(Window* child);
void RemoveChild(Window* child);
+ const Windows& children() const { return children_; }
+
static void ConvertPointToWindow(Window* source,
Window* target,
gfx::Point* point);
@@ -137,8 +141,6 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
void* user_data() const { return user_data_; }
private:
- typedef std::vector<Window*> Windows;
-
// If SchedulePaint has been invoked on the Window the delegate is notified.
void UpdateLayerCanvas();
« no previous file with comments | « ui/aura/toplevel_window_event_filter.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698