change the way windows are parented when their parent is set to NULL.

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>
 
@@ skipping 14 matching lines @@
 class Layer;
 }
 
 namespace aura {
 
 class Desktop;
 class EventFilter;
 class KeyEvent;
 class LayoutManager;
 class MouseEvent;
+class ToplevelWindowContainer;
 class WindowDelegate;
 
 namespace internal {
 class FocusManager;
 class RootWindow;
 }
 
 // Aura window implementation. Interesting events are sent to the
 // WindowDelegate.
 // TODO(beng): resolve ownership.
 class AURA_EXPORT Window : public ui::LayerDelegate {
  public:
   typedef std::vector<Window*> Windows;
 
   explicit Window(WindowDelegate* delegate);
   ~Window();
 
   void Init();
 
+  int type() const { return type_; }

[sky, 2011/10/07 19:59:45]

Add a description of what this is and who uses it.

+  void SetType(int type);
+
   int id() const { return id_; }
   void set_id(int id) { id_ = id; }
 
   const std::string& name() const { return name_; }
   void set_name(const std::string& name) { name_ = name; }
 
   ui::Layer* layer() { return layer_.get(); }
   const ui::Layer* layer() const { return layer_.get(); }
 
   // Changes the visibility of the window.
@@ skipping 26 matching lines @@
   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;
+  // RTTI to a container for top-level windows. Returns NULL if this window is
+  // not a top level window container.
+  virtual ToplevelWindowContainer* AsToplevelWindowContainer();
+  virtual const ToplevelWindowContainer* AsToplevelWindowContainer() 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);
 
+  // Returns true if this window can be activated.
+  bool CanActivate() const;
+
   // 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);
 
   const Windows& children() const { return children_; }
 
   // Retrieves the first-level child with the specified id, or NULL if no first-
   // level child is found matching |id|.
   Window* GetChildById(int id);
+  const Window* GetChildById(int id) const;
 
   static void ConvertPointToWindow(Window* source,
                                    Window* target,
                                    gfx::Point* point);
 
   // Returns the cursor for the specified point, in window coordinates.
   gfx::NativeCursor GetCursor(const gfx::Point& point) const;
 
   // Window takes ownership of the EventFilter.
   void SetEventFilter(EventFilter* event_filter);
@@ skipping 71 matching lines @@
   // it in the z-order.
   bool StopsEventPropagation() const;
 
   // Overridden from ui::LayerDelegate:
   virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE;
 
   // Update the show state and restore bounds. Returns false
   // if |new_show_state| is same as current show state.
   bool UpdateShowStateAndRestoreBounds(ui::WindowShowState new_show_state);
 
+  int type_;
+
   WindowDelegate* delegate_;
 
   ui::WindowShowState show_state_;
 
   // The original bounds of a maximized/fullscreen window.
   gfx::Rect restore_bounds_;
 
   scoped_ptr<ui::Layer> layer_;
 
   // The Window's parent.
@@ skipping 13 matching lines @@
   // When true, events are not sent to windows behind this one in the z-order,
   // provided this window has children. See set_stops_event_propagation().
   bool stops_event_propagation_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_H_