Adds two new observer methods to allow code to be notified when a Window is added/removed from a ...

ui/aura/window.h

 // Copyright (c) 2012 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 <map>
 #include <string>
@@ skipping 275 matching lines @@
   // TODO(oshima): Returning 0 for non existing property is problematic.
   // Fix ViewProp to be able to tell if the property exists and
   // change it to -1.
   void* GetProperty(const char* name) const;
   int GetIntProperty(const char* name) const;
 
   // Returns true if this window is currently stopping event
   // propagation for any windows behind it in the z-order.
   bool StopsEventPropagation() const;
 
- protected:
-  // Called when the |window| is being detached from the root window
-  // by being removed from its parent. It is called before |parent_| is
-  // set to NULL.
-  virtual void OnWindowDetachingFromRootWindow(aura::Window* window);
-
-  // Called when the |window| is attached to the root window by being added
-  // to its parent.
-  virtual void OnWindowAttachedToRootWindow(aura::Window* window);
-
  private:
   friend class LayoutManager;
 
   // Changes the bounds of the window without condition.
   void SetBoundsInternal(const gfx::Rect& new_bounds);
 
   // Updates the visible state of the layer, but does not make visible-state
   // specific changes. Called from Show()/Hide().
   void SetVisible(bool visible);
 
   // Schedules a paint for the Window's entire bounds.
   void SchedulePaint();
 
   // Gets a Window (either this one or a subwindow) containing |local_point|.
   // If |return_tightest| is true, returns the tightest-containing (i.e.
   // furthest down the hierarchy) Window containing the point; otherwise,
   // returns the loosest.  If |for_event_handling| is true, then hit-test masks
   // and StopsEventPropagation() are honored; otherwise, only bounds checks are
   // performed.
   Window* GetWindowForPoint(const gfx::Point& local_point,
                             bool return_tightest,
                             bool for_event_handling);
 
   // Called when this window's parent has changed.
   void OnParentChanged();
 
   // Called when this window's stacking order among its siblings is changed.
   void OnStackingChanged();
 
+  // Notifies observers registered with this Window (and its subtree) when the
+  // Window has been added or is about to be removed from a RootWindow.
+  void NotifyAddedToRootWindow();
+  void NotifyRemovingFromRootWindow();
+
   // Overridden from ui::LayerDelegate:
   virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE;
 
   // Updates the layer name with a name based on the window's name and id.
   void UpdateLayerName(const std::string& name);
 
   // Returns true if this window is behind a window that stops event
   // propagation.
   bool IsBehindStopEventsWindow() const;
 
@@ skipping 53 matching lines @@
   // TODO(oshima): Consolidcate ViewProp and aura::window property
   // implementation.
   std::map<const char*, void*> prop_map_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_H_