| Index: ui/gfx/android/view_configuration.h
|
| diff --git a/ui/gfx/android/view_configuration.h b/ui/gfx/android/view_configuration.h
|
| index 4595071c4f1c7176d1009eb02c4e9fef0b972f65..1c490c9a5037956007c49b987a0d4dc71120611c 100644
|
| --- a/ui/gfx/android/view_configuration.h
|
| +++ b/ui/gfx/android/view_configuration.h
|
| @@ -22,14 +22,14 @@ class GFX_EXPORT ViewConfiguration {
|
| // Dimensionless coefficient of friction.
|
| static float GetScrollFriction();
|
|
|
| - static int GetMaximumFlingVelocityInPixelsPerSecond();
|
| - static int GetMinimumFlingVelocityInPixelsPerSecond();
|
| + static int GetMaximumFlingVelocityInDipsPerSecond();
|
| + static int GetMinimumFlingVelocityInDipsPerSecond();
|
|
|
| - static int GetTouchSlopInPixels();
|
| - static int GetDoubleTapSlopInPixels();
|
| + static int GetTouchSlopInDips();
|
| + static int GetDoubleTapSlopInDips();
|
|
|
| - static int GetMinScalingSpanInPixels();
|
| - static int GetMinScalingTouchMajorInPixels();
|
| + static int GetMinScalingSpanInDips();
|
| + static int GetMinScalingTouchMajorInDips();
|
|
|
| // Registers methods with JNI and returns true if succeeded.
|
| static bool RegisterViewConfiguration(JNIEnv* env);
|
|
|