1 files changed, 6 insertions, 6 deletions
diff --git a/ui/aura/gestures/gesture_point.h b/ui/aura/gestures/gesture_point.h
index f39d252..ff715ea 100644
--- a/ui/aura/gestures/gesture_point.h
+++ b/ui/aura/gestures/gesture_point.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
+#include "ui/aura/gestures/velocity_calculator.h"
 #include "ui/gfx/point.h"
 
 namespace aura {
@@ -44,7 +45,7 @@ class GesturePoint {
   bool IsInClickWindow(const TouchEvent& event) const;
   bool IsInDoubleClickWindow(const TouchEvent& event) const;
   bool IsInScrollWindow(const TouchEvent& event) const;
-  bool IsInFlickWindow(const TouchEvent& event) const;
+  bool IsInFlickWindow(const TouchEvent& event);
   bool DidScroll(const TouchEvent& event) const;
 
   const gfx::Point& first_touch_position() const {
@@ -62,8 +63,8 @@ class GesturePoint {
     return last_touch_position_.y() - first_touch_position_.y();
   }
 
-  float x_velocity() const { return x_velocity_; }
-  float y_velocity() const { return y_velocity_; }
+  float XVelocity() { return velocity_calculator_.XVelocity(); }
+  float YVelocity() { return velocity_calculator_.YVelocity(); }
 
  private:
   // Various statistical functions to manipulate gestures.
@@ -71,7 +72,7 @@ class GesturePoint {
   bool IsInSecondClickTimeWindow() const;
   bool IsInsideManhattanSquare(const TouchEvent& event) const;
   bool IsSecondClickInsideManhattanSquare(const TouchEvent& event) const;
-  bool IsOverMinFlickSpeed() const;
+  bool IsOverMinFlickSpeed();
 
   gfx::Point first_touch_position_;
   double first_touch_time_;
@@ -81,8 +82,7 @@ class GesturePoint {
   double last_tap_time_;
   gfx::Point last_tap_position_;
 
-  float x_velocity_;
-  float y_velocity_;
+  VelocityCalculator velocity_calculator_;
 
   DISALLOW_COPY_AND_ASSIGN(GesturePoint);
 };