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

ui/aura/root_window.cc

 // 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.
 
 #include "ui/aura/root_window.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 395 matching lines @@
 void RootWindow::SetGestureRecognizerForTesting(GestureRecognizer* gr) {
   gesture_recognizer_.reset(gr);
 }
 
 #if !defined(NDEBUG)
 void RootWindow::ToggleFullScreen() {
   host_->ToggleFullScreen();
 }
 #endif
 
+////////////////////////////////////////////////////////////////////////////////
+// RootWindow, Window overrides:
+
 RootWindow* RootWindow::GetRootWindow() {
   return this;
 }
 
 void RootWindow::SetTransform(const ui::Transform& transform) {
   Window::SetTransform(transform);
 
   // If the layer is not animating, then we need to update the host size
   // immediately.
   if (!layer()->GetAnimator()->is_animating())
     OnHostResized(host_->GetSize());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// 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()
     : Window(NULL),
       host_(aura::RootWindowHost::Create(GetInitialHostWindowBounds())),
       ALLOW_THIS_IN_INITIALIZER_LIST(schedule_paint_factory_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(event_factory_(this)),
       mouse_button_flags_(0),
       last_cursor_(kCursorNull),
       screen_(new ScreenAura),
@@ skipping 168 matching lines @@
     return false;
   bool handled = false;
   for (unsigned int i = 0; i < gestures->size(); i++) {
     GestureEvent* gesture = gestures->at(i).get();
     if (DispatchGestureEvent(gesture) != ui::GESTURE_STATUS_UNKNOWN)
       handled = true;
   }
   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,
   // release the capture.
   if (detached->Contains(capture_window_) && detached != this)
     ReleaseCapture(capture_window_);
 
   // If the ancestor of the focused window is detached,
   // release the focus.
   if (detached->Contains(focused_window_))
     SetFocusedWindow(NULL);
 
   // If the ancestor of any event handler windows are detached, release the
   // pointer to those windows.
   if (detached->Contains(mouse_pressed_handler_))
     mouse_pressed_handler_ = NULL;
   if (detached->Contains(mouse_moved_handler_))
     mouse_moved_handler_ = NULL;
   if (detached->Contains(touch_event_handler_))
     touch_event_handler_ = NULL;
 
   if (detached->IsVisible() &&
       detached->ContainsPointInRoot(last_mouse_location_)) {
     PostMouseMoveEventAfterWindowChange();
   }
 }
 
-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());
 }
 
 void RootWindow::OnLayerAnimationScheduled(
     const ui::LayerAnimationSequence* animation) {
 }
 
 void RootWindow::OnLayerAnimationAborted(
@@ skipping 76 matching lines @@
   synthesize_mouse_move_ = false;
   gfx::Point orig_mouse_location = last_mouse_location_;
   layer()->transform().TransformPoint(orig_mouse_location);
 
   // TODO(derat|oshima): Don't use mouse_button_flags_ as it's
   // is currently broken. See/ crbug.com/107931.
   MouseEvent event(ui::ET_MOUSE_MOVED,
                    orig_mouse_location,
                    orig_mouse_location,
                    0);
-  DispatchMouseEvent(&event);
+  //DispatchMouseEvent(&event);
 }
 
 }  // namespace aura