Eager Gesture Recognizer (WIP)

ui/aura/gestures/gesture_recognizer_unittest.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 "base/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/timer/timer.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 441 matching lines @@
   bool mouse_exit_;
   bool mouse_press_;
   bool mouse_release_;
   bool mouse_move_;
   bool double_click_;
 
   DISALLOW_COPY_AND_ASSIGN(GestureEventSynthDelegate);
 };
 
 class TestOneShotGestureSequenceTimer
-    : public base::OneShotTimer<ui::GestureSequence> {
+    : public base::OneShotTimer<ui::GestureEventQueueTimerInterface> {
  public:
   TestOneShotGestureSequenceTimer() {}
 
   void ForceTimeout() {
     if (IsRunning()) {
       user_task().Run();
       Stop();
     }
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestOneShotGestureSequenceTimer);
 };
 
 class TimerTestGestureSequence : public ui::GestureSequence {
  public:
-  explicit TimerTestGestureSequence(ui::GestureSequenceDelegate* delegate)
-      : ui::GestureSequence(delegate) {
+  explicit TimerTestGestureSequence(
+      ui::GestureEventQueueTimerInterface* geq_timers)
+      : ui::GestureSequence(geq_timers) {
   }
 
   void ForceTimeout() {
     static_cast<TestOneShotGestureSequenceTimer*>(
         GetLongPressTimer())->ForceTimeout();
   }
 
   bool IsTimerRunning() {
     return GetLongPressTimer()->IsRunning();
   }
 
-  virtual base::OneShotTimer<ui::GestureSequence>* CreateTimer() OVERRIDE {
+  virtual base::OneShotTimer<ui::GestureEventQueueTimerInterface>*
+  CreateTimer() OVERRIDE {
     return new TestOneShotGestureSequenceTimer();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TimerTestGestureSequence);
 };
 
 class TestGestureRecognizer : public ui::GestureRecognizerImpl {
  public:
   TestGestureRecognizer() : GestureRecognizerImpl() {
   }
 
   ui::GestureSequence* GetGestureSequenceForTesting(Window* window) {
-    return GetGestureSequenceForConsumer(window);
+    return GetGestureSequenceForConsumer(window, NULL);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestGestureRecognizer);
 };
 
 class TimerTestGestureRecognizer : public TestGestureRecognizer {
  public:
   TimerTestGestureRecognizer() : TestGestureRecognizer() {
   }
 
   virtual ui::GestureSequence* CreateSequence(
-      ui::GestureSequenceDelegate* delegate) OVERRIDE {
-    return new TimerTestGestureSequence(delegate);
+      ui::GestureEventQueueTimerInterface* geq_timers) OVERRIDE {
+    return new TimerTestGestureSequence(geq_timers);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TimerTestGestureRecognizer);
 };
 
 base::TimeDelta GetTime() {
   return ui::EventTimeForNow();
 }
 
@@ skipping 3175 matching lines @@
   ui::TouchEvent release1(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),
                           kTouchId, tes.LeapForward(50));
   dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release1);
   EXPECT_TRUE(delegate->show_press());
   EXPECT_FALSE(delegate->tap_cancel());
   EXPECT_TRUE(delegate->tap());
 }
 
 }  // namespace test
 }  // namespace aura