Window ownership -> WindowTreeHost

ui/aura/window_event_dispatcher.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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_EVENT_DISPATCHER_H_
 #define UI_AURA_WINDOW_EVENT_DISPATCHER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
@@ skipping 22 matching lines @@
 }
 
 namespace ui {
 class GestureEvent;
 class GestureRecognizer;
 class KeyEvent;
 class LayerAnimationSequence;
 class MouseEvent;
 class ScrollEvent;
 class TouchEvent;
-class ViewProp;
 }
 
 namespace aura {
 class RootWindowObserver;
 class TestScreen;
 class WindowTargeter;
 
-// RootWindow is responsible for hosting a set of windows.
+// WindowEventDispatcher orchestrates event dispatch within a window tree
+// owned by WindowTreeHost. WTH also owns the WED.
+// TODO(beng): In progress, remove functionality not directly related to
+//             event dispatch.
 class AURA_EXPORT WindowEventDispatcher : public ui::EventProcessor,
                                           public ui::GestureEventHelper,
                                           public ui::LayerAnimationObserver,
                                           public client::CaptureDelegate,
                                           public WindowTreeHostDelegate {
  public:
   explicit WindowEventDispatcher(WindowTreeHost* host);
   virtual ~WindowEventDispatcher();
 
-  // Returns the WindowTreeHost for the specified accelerated widget, or NULL
-  // if there is none associated.
-  static WindowEventDispatcher* GetForAcceleratedWidget(
-      gfx::AcceleratedWidget widget);
-
-  Window* window() {
-    return const_cast<Window*>(
-        const_cast<const WindowEventDispatcher*>(this)->window());
-  }
-  const Window* window() const { return window_.get(); }
+  Window* window() { return host()->window(); }
+  const Window* window() const { return host()->window(); }
   WindowTreeHost* host() {
     return const_cast<WindowTreeHost*>(
         const_cast<const WindowEventDispatcher*>(this)->host());
   }
   const WindowTreeHost* host() const { return host_; }
   Window* mouse_pressed_handler() { return mouse_pressed_handler_; }
   Window* mouse_moved_handler() { return mouse_moved_handler_; }
 
   // Stop listening events in preparation for shutdown.
   void PrepareForShutdown();
@@ skipping 16 matching lines @@
   // events are dispatched from GestureRecognizer instead of WindowTreeHost.
   void DispatchGestureEvent(ui::GestureEvent* event);
 
   // Invoked when |window| is being destroyed.
   void OnWindowDestroying(Window* window);
 
   // Invoked when |window|'s bounds have changed. |contained_mouse| indicates if
   // the bounds before change contained the |last_moust_location()|.
   void OnWindowBoundsChanged(Window* window, bool contained_mouse);
 
-  // Dispatches OnMouseExited to the |window| which is hiding if nessessary.
+  // Dispatches OnMouseExited to the |window| which is hiding if necessary.
   void DispatchMouseExitToHidingWindow(Window* window);
 
   // Dispatches a ui::ET_MOUSE_EXITED event at |point|.
   void DispatchMouseExitAtPoint(const gfx::Point& point);
 
   // Invoked when |window|'s visibility has changed.
   void OnWindowVisibilityChanged(Window* window, bool is_visible);
 
-  // Invoked when |window|'s tranfrom has changed. |contained_mouse|
+  // Invoked when |window|'s transform has changed. |contained_mouse|
   // indicates if the bounds before change contained the
   // |last_moust_location()|.
   void OnWindowTransformed(Window* window, bool contained_mouse);
 
   // Invoked when the keyboard mapping (in X11 terms: the mapping between
-  // keycodes and keysyms) has changed.
+  // key-codes and key-syms) has changed.
   void OnKeyboardMappingChanged();
 
   // The system windowing system has sent a request that we close our window.
   void OnWindowTreeHostCloseRequested();
 
   // Add/remove observer. There is no need to remove the observer if
   // the root window is being deleted. In particular, you SHOULD NOT remove
   // in |WindowObserver::OnWindowDestroying| of the observer observing
   // the root window because it is too late to remove it.
   void AddRootWindowObserver(RootWindowObserver* observer);
@@ skipping 130 matching lines @@
   void SynthesizeMouseMoveEventAsync();
 
   // Posts a task to send synthesized mouse move event if there
   // is no a pending task.
   void PostMouseMoveEventAfterWindowChange();
 
   void PreDispatchLocatedEvent(Window* target, ui::LocatedEvent* event);
   void PreDispatchMouseEvent(Window* target, ui::MouseEvent* event);
   void PreDispatchTouchEvent(Window* target, ui::TouchEvent* event);
 
-  // TODO(beng): should be owned by WindowTreeHost.
-  scoped_ptr<Window> window_;
-
   WindowTreeHost* host_;
 
   // Touch ids that are currently down.
   uint32 touch_ids_down_;
 
   ObserverList<RootWindowObserver> observers_;
 
   Window* mouse_pressed_handler_;
   Window* mouse_moved_handler_;
   Window* event_dispatch_target_;
   Window* old_dispatch_target_;
 
   bool synthesize_mouse_move_;
 
   // How many move holds are outstanding. We try to defer dispatching
   // touch/mouse moves while the count is > 0.
   int move_hold_count_;
   // The location of |held_move_event_| is in |window_|'s coordinate.
   scoped_ptr<ui::LocatedEvent> held_move_event_;
 
   // Allowing for reposting of events. Used when exiting context menus.
   scoped_ptr<ui::LocatedEvent> held_repostable_event_;
 
   // Set when dispatching a held event.
   bool dispatching_held_event_;
 
-  scoped_ptr<ui::ViewProp> prop_;
-
   // Used to schedule reposting an event.
   base::WeakPtrFactory<WindowEventDispatcher> repost_event_factory_;
 
   // Used to schedule DispatchHeldEvents() when |move_hold_count_| goes to 0.
   base::WeakPtrFactory<WindowEventDispatcher> held_event_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowEventDispatcher);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_EVENT_DISPATCHER_H_