Better Z-index support.

ui/aura/window.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_AURA_WINDOW_H_
 #define UI_AURA_WINDOW_H_
 #pragma once
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/string16.h"
 #include "ui/aura/aura_export.h"
 #include "ui/gfx/compositor/layer_delegate.h"
 #include "ui/gfx/rect.h"
 
 class SkCanvas;
 
 namespace ui {
 class Compositor;
 class Layer;
 }
 
 namespace aura {
 
 class Desktop;
 class KeyEvent;
 class LayoutManager;
 class MouseEvent;
 class WindowDelegate;
-class WindowManager;
+class EventFilter;
 
 namespace internal {
 class FocusManager;
 }
 
 // Aura window implementation. Interesting events are sent to the
 // WindowDelegate.
 // TODO(beng): resolve ownership.
 class AURA_EXPORT Window : public ui::LayerDelegate {
  public:
@@ skipping 10 matching lines @@
   };
 
   explicit Window(WindowDelegate* delegate);
   ~Window();
 
   void Init();
 
   int id() const { return id_; }
   void set_id(int id) { id_ = id; }
 
+  string16 name() const { return name_; }

[tfarina, 2011/09/20 02:19:24]

const string16& name() const { ... } ?

+  void set_name(const string16& name) { name_ = name; }
+
   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_; }
 
   // Assigns a LayoutManager to size and place child windows.
   // The Window takes ownership of the LayoutManager.
   void SetLayoutManager(LayoutManager* layout_manager);
 
   // Changes the bounds of the window.
   void SetBounds(const gfx::Rect& bounds, int anim_ms);
   const gfx::Rect& bounds() const { return bounds_; }
 
   // Marks the a portion of window as needing to be painted.
   void SchedulePaintInRect(const gfx::Rect& rect);
 
   // 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_; }
 
   // Returns true if this Window is the container for toplevel windows.
-  virtual bool IsTopLevelWindowContainer() const;
+  virtual bool IsToplevelWindowContainer() const;
 
   // Move the specified child of this Window to the front of the z-order.
   // TODO(beng): this is (obviously) feeble.
   void MoveChildToFront(Window* child);
 
   // Tree operations.
   // TODO(beng): Child windows are currently not owned by the hierarchy. We
   //             should change this.
   void AddChild(Window* child);
   void RemoveChild(Window* child);
 
   static void ConvertPointToWindow(Window* source,
                                    Window* target,
                                    gfx::Point* point);
 
+  // Window takes ownership of the EventFilter.
+  void SetEventFilter(EventFilter* event_filter);
+
   // Handles a mouse event. Returns true if handled.
   bool OnMouseEvent(MouseEvent* event);
 
   // Handles a key event. Returns true if handled.
   bool OnKeyEvent(KeyEvent* event);
 
   WindowDelegate* delegate() { return delegate_; }
 
   // Returns true if the mouse pointer at the specified |point| can trigger an
   // event for this Window.
@@ skipping 36 matching lines @@
   gfx::Rect bounds_;
 
   // The Window's parent.
   // TODO(beng): Implement NULL-ness for toplevels.
   Window* parent_;
 
   // Child windows. Topmost is last.
   Windows children_;
 
   int id_;
+  string16 name_;
 
-  scoped_ptr<WindowManager> window_manager_;
+  scoped_ptr<EventFilter> event_filter_;
   scoped_ptr<LayoutManager> layout_manager_;
 
   void* user_data_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_H_