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

ui/aura/root_window.cc

Index: ui/aura/root_window.cc
===================================================================
--- ui/aura/root_window.cc	(revision 119955)
+++ ui/aura/root_window.cc	(working copy)
@@ -413,6 +413,9 @@
 }
 #endif
 
+////////////////////////////////////////////////////////////////////////////////
+// RootWindow, Window overrides:
+
 RootWindow* RootWindow::GetRootWindow() {
   return this;
 }
@@ -427,6 +430,17 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// RootWindow, ui::CompositorDelegate implementation:
+
+void RootWindow::ScheduleDraw() {
+  if (!schedule_paint_factory_.HasWeakPtrs()) {
+    MessageLoop::current()->PostTask(
+        FROM_HERE,
+        base::Bind(&RootWindow::Draw, schedule_paint_factory_.GetWeakPtr()));
+  }
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // RootWindow, private:
 
 RootWindow::RootWindow()
@@ -615,27 +629,7 @@
   return handled;
 }
 
-void RootWindow::ScheduleDraw() {
-  if (!schedule_paint_factory_.HasWeakPtrs()) {
-    MessageLoop::current()->PostTask(
-        FROM_HERE,
-        base::Bind(&RootWindow::Draw, schedule_paint_factory_.GetWeakPtr()));
-  }
-}
-
-bool RootWindow::CanFocus() const {
-  return IsVisible();
-}
-
-bool RootWindow::CanReceiveEvents() const {
-  return IsVisible();
-}
-
-internal::FocusManager* RootWindow::GetFocusManager() {
-  return this;
-}
-
-void RootWindow::OnWindowDetachingFromRootWindow(Window* detached) {
+void RootWindow::OnWindowRemovedFromRootWindow(Window* detached) {
   DCHECK(capture_window_ != this);
 
   // If the ancestor of the capture window is detached,
@@ -663,12 +657,24 @@
   }
 }
 
-void RootWindow::OnWindowAttachedToRootWindow(Window* attached) {
+void RootWindow::OnWindowAddedToRootWindow(Window* attached) {
   if (attached->IsVisible() &&
       attached->ContainsPointInRoot(last_mouse_location_))
     PostMouseMoveEventAfterWindowChange();
 }
 
+bool RootWindow::CanFocus() const {
+  return IsVisible();
+}
+
+bool RootWindow::CanReceiveEvents() const {
+  return IsVisible();
+}
+
+internal::FocusManager* RootWindow::GetFocusManager() {
+  return this;
+}
+
 void RootWindow::OnLayerAnimationEnded(
     const ui::LayerAnimationSequence* animation) {
   OnHostResized(host_->GetSize());