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

ui/aura/root_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_ROOT_WINDOW_H_
 #define UI_AURA_ROOT_WINDOW_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
@@ skipping 174 matching lines @@
   void ToggleFullScreen();
 #endif
 
   // Overridden from Window:
   virtual RootWindow* GetRootWindow() OVERRIDE;
   virtual void SetTransform(const ui::Transform& transform) OVERRIDE;
 
   // Overridden from ui::CompositorDelegate:
   virtual void ScheduleDraw() OVERRIDE;
 
-  // Overridden from Window:
-  virtual void OnWindowAttachedToRootWindow(
-      Window* window) OVERRIDE;
-  virtual void OnWindowDetachingFromRootWindow(
-      Window* window) OVERRIDE;
+ private:
+  friend class Window;
 
- private:
   RootWindow();
   virtual ~RootWindow();
 
   // Called whenever the mouse moves, tracks the current |mouse_moved_handler_|,
   // sending exited and entered events as its value changes.
   void HandleMouseMoved(const MouseEvent& event, Window* target);
 
   bool ProcessMouseEvent(Window* target, MouseEvent* event);
   bool ProcessKeyEvent(Window* target, KeyEvent* event);
   ui::TouchStatus ProcessTouchEvent(Window* target, TouchEvent* event);
   ui::GestureStatus ProcessGestureEvent(Window* target, GestureEvent* event);
   bool ProcessGestures(GestureRecognizer::Gestures* gestures);
 
+  // Called when a Window is attached or detached from the RootWindow.
+  void OnWindowAddedToRootWindow(Window* window);
+  void OnWindowRemovedFromRootWindow(Window* window);
+
   // Overridden from Window:
   virtual bool CanFocus() const OVERRIDE;
   virtual bool CanReceiveEvents() const OVERRIDE;
   virtual internal::FocusManager* GetFocusManager() OVERRIDE;
 
   // Overridden from ui::LayerAnimationObserver:
   virtual void OnLayerAnimationEnded(
       const ui::LayerAnimationSequence* animation) OVERRIDE;
   virtual void OnLayerAnimationScheduled(
       const ui::LayerAnimationSequence* animation) OVERRIDE;
@@ skipping 64 matching lines @@
   scoped_ptr<GestureRecognizer> gesture_recognizer_;
 
   bool synthesize_mouse_move_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindow);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_ROOT_WINDOW_H_