Re-enable Eager Gesture Recognition on Aura

ui/events/gestures/gesture_recognizer_impl.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/events/gestures/gesture_recognizer_impl.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 216 matching lines @@
 
 void GestureRecognizerImpl::DispatchGestureEvent(GestureEvent* event) {
   GestureConsumer* consumer = GetTargetForGestureEvent(*event);
   if (consumer) {
     GestureEventHelper* helper = FindDispatchHelperForConsumer(consumer);
     if (helper)
       helper->DispatchGestureEvent(event);
   }
 }
 
-bool GestureRecognizerImpl::ProcessTouchEventPreDispatch(
-    const TouchEvent& event,
-    GestureConsumer* consumer) {
+bool GestureRecognizerImpl::ProcessTouchEvent(const TouchEvent& event,
+                                              GestureConsumer* consumer) {
   SetupTargets(event, consumer);
 
   if (event.result() & ER_CONSUMED)
     return false;
 
   GestureProviderAura* gesture_provider =
       GetGestureProviderForConsumer(consumer);
   return gesture_provider->OnTouchEvent(event);
 }
 
-GestureRecognizer::Gestures*
-GestureRecognizerImpl::ProcessTouchEventPostDispatch(
+GestureRecognizer::Gestures* GestureRecognizerImpl::ProcessTouchEventAck(
     const TouchEvent& event,
     ui::EventResult result,
     GestureConsumer* consumer) {
+  DCHECK(!(result & ui::ER_CONSUMED));
   GestureProviderAura* gesture_provider =
       GetGestureProviderForConsumer(consumer);
   gesture_provider->OnTouchEventAck(result != ER_UNHANDLED);
-  return gesture_provider->GetAndResetPendingGestures();
-}
-
-GestureRecognizer::Gestures* GestureRecognizerImpl::ProcessTouchEventOnAsyncAck(
-    const TouchEvent& event,
-    ui::EventResult result,
-    GestureConsumer* consumer) {
-  if (result & ui::ER_CONSUMED)
-    return NULL;
-  GestureProviderAura* gesture_provider =
-      GetGestureProviderForConsumer(consumer);
-  gesture_provider->OnTouchEventAck(result != ER_UNHANDLED);
   return gesture_provider->GetAndResetPendingGestures();
 }
 
 bool GestureRecognizerImpl::CleanupStateForConsumer(
     GestureConsumer* consumer) {
   bool state_cleaned_up = false;
 
   if (consumer_gesture_provider_.count(consumer)) {
     state_cleaned_up = true;
     delete consumer_gesture_provider_[consumer];
@@ skipping 59 matching lines @@
   std::vector<GestureEventHelper*>::iterator it;
   for (it = helpers.begin(); it != helpers.end(); ++it)
     gesture_recognizer->AddGestureEventHelper(*it);
 
   helpers.clear();
   g_gesture_recognizer_instance =
       static_cast<GestureRecognizerImpl*>(gesture_recognizer);
 }
 
 }  // namespace ui