Clean up WindowEventDispatcher some more.

ui/aura/window_event_dispatcher.h

 // 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"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/aura/aura_export.h"
 #include "ui/aura/client/capture_delegate.h"
 #include "ui/aura/window_tree_host.h"
-#include "ui/aura/window_tree_host_delegate.h"
 #include "ui/base/cursor/cursor.h"
-#include "ui/compositor/compositor.h"
-#include "ui/compositor/layer_animation_observer.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/event_targeter.h"
 #include "ui/events/gestures/gesture_recognizer.h"
 #include "ui/events/gestures/gesture_types.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
 
 namespace gfx {
 class Size;
 class Transform;
 }
 
 namespace ui {
 class GestureEvent;
 class GestureRecognizer;
 class KeyEvent;
-class LayerAnimationSequence;
 class MouseEvent;
 class ScrollEvent;
 class TouchEvent;
 }
 
 namespace aura {
 class RootWindowObserver;
 class TestScreen;
 class WindowTargeter;
 
 // 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 client::CaptureDelegate {
  public:
   explicit WindowEventDispatcher(WindowTreeHost* host);
   virtual ~WindowEventDispatcher();
 
   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();
 
   // Repost event for re-processing. Used when exiting context menus.
   // We only support the ET_MOUSE_PRESSED and ET_GESTURE_TAP_DOWN event
   // types (although the latter is currently a no-op).
   void RepostEvent(const ui::LocatedEvent& event);
 
-  WindowTreeHostDelegate* AsWindowTreeHostDelegate();
-
   // Invoked when the mouse events get enabled or disabled.
   void OnMouseEventsEnableStateChanged(bool enabled);
 
+  void DispatchCancelModeEvent();
+
   // Returns a target window for the given gesture event.
   Window* GetGestureTarget(ui::GestureEvent* event);
 
   // Handles a gesture event. Returns true if handled. Unlike the other
   // event-dispatching function (e.g. for touch/mouse/keyboard events), gesture
   // events are dispatched from GestureRecognizer instead of WindowTreeHost.
   void DispatchGestureEvent(ui::GestureEvent* event);
 
   // Invoked when |window| is being destroyed.
   void OnWindowDestroying(Window* window);
@@ skipping 35 matching lines @@
   //
   // More than one hold can be invoked and each hold must be cancelled by a
   // release before we resume normal operation.
   void HoldPointerMoves();
   void ReleasePointerMoves();
 
   // Gets the last location seen in a mouse event in this root window's
   // coordinates. This may return a point outside the root window's bounds.
   gfx::Point GetLastMouseLocationInRoot() const;
 
+  void OnHostLostMouseGrab();
+  // TODO(beng): replace with a window observer.
+  void OnHostResized(const gfx::Size& size);
+  void OnCursorMovedToRootLocation(const gfx::Point& root_location);
+
  private:
   FRIEND_TEST_ALL_PREFIXES(WindowEventDispatcherTest,
                            KeepTranslatedEventInRoot);
 
   friend class Window;
   friend class TestScreen;
 
   // The parameter for OnWindowHidden() to specify why window is hidden.
   enum WindowHiddenReason {
     WINDOW_DESTROYED,  // Window is destroyed.
     WINDOW_HIDDEN,     // Window is hidden.
     WINDOW_MOVING,     // Window is temporarily marked as hidden due to move
                        // across root windows.
   };
 
   // Updates the event with the appropriate transform for the device scale
-  // factor. The WindowTreeHostDelegate dispatches events in the physical pixel
+  // factor. The WindowEventDispatcher dispatches events in the physical pixel
   // coordinate. But the event processing from WindowEventDispatcher onwards
   // happen in device-independent pixel coordinate. So it is necessary to update
   // the event received from the host.
   void TransformEventForDeviceScaleFactor(ui::LocatedEvent* event);
 
   // Dispatches the specified event type (intended for enter/exit) to the
   // |mouse_moved_handler_|.
   ui::EventDispatchDetails DispatchMouseEnterOrExit(
       const ui::MouseEvent& event,
       ui::EventType type) WARN_UNUSED_RESULT;
@@ skipping 31 matching lines @@
   virtual ui::EventDispatchDetails PreDispatchEvent(ui::EventTarget* target,
                                                     ui::Event* event) OVERRIDE;
   virtual ui::EventDispatchDetails PostDispatchEvent(
       ui::EventTarget* target, const ui::Event& event) OVERRIDE;
 
   // Overridden from ui::GestureEventHelper.
   virtual bool CanDispatchToConsumer(ui::GestureConsumer* consumer) OVERRIDE;
   virtual void DispatchPostponedGestureEvent(ui::GestureEvent* event) OVERRIDE;
   virtual void DispatchCancelTouchEvent(ui::TouchEvent* event) OVERRIDE;
 
-  // Overridden from ui::LayerAnimationObserver:
-  virtual void OnLayerAnimationEnded(
-      ui::LayerAnimationSequence* animation) OVERRIDE;
-  virtual void OnLayerAnimationScheduled(
-      ui::LayerAnimationSequence* animation) OVERRIDE;
-  virtual void OnLayerAnimationAborted(
-      ui::LayerAnimationSequence* animation) OVERRIDE;
-
-  // Overridden from aura::WindowTreeHostDelegate:
-  virtual void OnHostCancelMode() OVERRIDE;
-  virtual void OnHostActivated() OVERRIDE;
-  virtual void OnHostLostWindowCapture() OVERRIDE;
-  virtual void OnHostLostMouseGrab() OVERRIDE;
-  virtual void OnHostResized(const gfx::Size& size) OVERRIDE;
-  virtual void OnCursorMovedToRootLocation(
-      const gfx::Point& root_location) OVERRIDE;
-  virtual WindowEventDispatcher* AsDispatcher() OVERRIDE;
-  virtual const WindowEventDispatcher* AsDispatcher() const OVERRIDE;
-  virtual ui::EventProcessor* GetEventProcessor() OVERRIDE;
-
   // We hold and aggregate mouse drags and touch moves as a way of throttling
   // resizes when HoldMouseMoves() is called. The following methods are used to
   // dispatch held and newly incoming mouse and touch events, typically when an
   // event other than one of these needs dispatching or a matching
   // ReleaseMouseMoves()/ReleaseTouchMoves() is called.  NOTE: because these
   // methods dispatch events from WindowTreeHost the coordinates are in terms of
   // the root.
 
   ui::EventDispatchDetails DispatchHeldEvents() WARN_UNUSED_RESULT;
   // Creates and dispatches synthesized mouse move event using the
@@ skipping 39 matching lines @@
 
   // 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_