Revert of Unified Gesture Recognizer

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"
@@ skipping 54 matching lines @@
   // 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);
 
   // Invoked when the mouse events get enabled or disabled.
   void OnMouseEventsEnableStateChanged(bool enabled);
 
   void DispatchCancelModeEvent();
 
+  // 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);
+
   // Dispatches a ui::ET_MOUSE_EXITED event at |point|.
   // TODO(beng): needed only for WTH::OnCursorVisibilityChanged().
   void DispatchMouseExitAtPoint(const gfx::Point& point);
 
   // Gesture Recognition -------------------------------------------------------
 
   // When a touch event is dispatched to a Window, it may want to process the
   // touch event asynchronously. In such cases, the window should consume the
   // event during the event dispatch. Once the event is properly processed, the
   // window should let the WindowEventDispatcher know about the result of the
@@ skipping 87 matching lines @@
 
   // Overridden from ui::EventDispatcherDelegate.
   virtual bool CanDispatchToTarget(ui::EventTarget* target) OVERRIDE;
   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 DispatchGestureEvent(ui::GestureEvent* event) OVERRIDE;
+  virtual void DispatchPostponedGestureEvent(ui::GestureEvent* event) OVERRIDE;
   virtual void DispatchCancelTouchEvent(ui::TouchEvent* event) OVERRIDE;
 
   // Overridden from WindowObserver:
   virtual void OnWindowDestroying(Window* window) OVERRIDE;
   virtual void OnWindowDestroyed(Window* window) OVERRIDE;
   virtual void OnWindowAddedToRootWindow(Window* window) OVERRIDE;
   virtual void OnWindowRemovingFromRootWindow(Window* window,
                                               Window* new_root) OVERRIDE;
   virtual void OnWindowVisibilityChanging(Window* window,
                                           bool visible) OVERRIDE;
@@ skipping 63 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_