events: Clean up dispatching code for touch-events.

ui/base/gestures/gesture_recognizer_impl.h

 // 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.
 
 #ifndef UI_BASE_GESTURES_GESTURE_RECOGNIZER_IMPL_H_
 #define UI_BASE_GESTURES_GESTURE_RECOGNIZER_IMPL_H_
 
 #include <map>
 #include <queue>
 #include <vector>
@@ skipping 35 matching lines @@
   virtual GestureSequence* GetGestureSequenceForConsumer(GestureConsumer* c);
 
  private:
   // Sets up the target consumer for gestures based on the touch-event.
   void SetupTargets(const TouchEvent& event, GestureConsumer* consumer);
 
   // Processes the next queued touch-event (and discards the touch-event). The
   // called must take ownership of the returned gestures and free them when they
   // are not needed anymore.
   Gestures* AdvanceTouchQueueByOne(GestureConsumer* consumer,
-                                   ui::TouchStatus status);
+                                   ui::EventResult result);
 
   // Overridden from GestureRecognizer
   virtual Gestures* ProcessTouchEventForGesture(
       const TouchEvent& event,
-      ui::TouchStatus status,
+      ui::EventResult result,
       GestureConsumer* target) OVERRIDE;
   virtual void QueueTouchEventForGesture(GestureConsumer* consumer,
                                          const TouchEvent& event) OVERRIDE;
   virtual Gestures* AdvanceTouchQueue(GestureConsumer* consumer,
                                       bool processed) OVERRIDE;
   virtual void FlushTouchQueue(GestureConsumer* consumer) OVERRIDE;
 
   typedef std::queue<TouchEvent*> TouchEventQueue;
   std::map<GestureConsumer*, TouchEventQueue*> event_queue_;
   std::map<GestureConsumer*, GestureSequence*> consumer_sequence_;
 
   // Both |touch_id_target_| and |touch_id_target_for_gestures_| map a touch-id
   // to its target window.  touch-ids are removed from |touch_id_target_| on
   // ET_TOUCH_RELEASE and ET_TOUCH_CANCEL. |touch_id_target_for_gestures_| are
   // removed in FlushTouchQueue().
   TouchIdToConsumerMap touch_id_target_;
   TouchIdToConsumerMap touch_id_target_for_gestures_;
 
   // Touches cancelled by touch capture are routed to the
   // gesture_consumer_ignorer_.
   scoped_ptr<GestureConsumer> gesture_consumer_ignorer_;
   GestureEventHelper* helper_;
 
   DISALLOW_COPY_AND_ASSIGN(GestureRecognizerImpl);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_GESTURES_GESTURE_RECOGNIZER_IMPL_H_