Index: ui/gfx/android/view_configuration.cc |
diff --git a/ui/gfx/android/view_configuration.cc b/ui/gfx/android/view_configuration.cc |
index 2a9ca90ef659703750c2140ffdcd7c75fbe491e2..ca384f39abacba009e3f6958c7548b8dda43afaa 100644 |
--- a/ui/gfx/android/view_configuration.cc |
+++ b/ui/gfx/android/view_configuration.cc |
@@ -24,7 +24,6 @@ struct ViewConfigurationData { |
: double_tap_timeout_in_ms_(0), |
long_press_timeout_in_ms_(0), |
tap_timeout_in_ms_(0), |
- scroll_friction_(1.f), |
max_fling_velocity_in_dips_s_(0), |
min_fling_velocity_in_dips_s_(0), |
touch_slop_in_dips_(0), |
@@ -40,7 +39,6 @@ struct ViewConfigurationData { |
long_press_timeout_in_ms_ = |
Java_ViewConfigurationHelper_getLongPressTimeout(env); |
tap_timeout_in_ms_ = Java_ViewConfigurationHelper_getTapTimeout(env); |
- scroll_friction_ = Java_ViewConfigurationHelper_getScrollFriction(env); |
jobject obj = j_view_configuration_helper_.obj(); |
Update(Java_ViewConfigurationHelper_getMaximumFlingVelocity(env, obj), |
@@ -65,7 +63,6 @@ struct ViewConfigurationData { |
int double_tap_timeout_in_ms() const { return double_tap_timeout_in_ms_; } |
int long_press_timeout_in_ms() const { return long_press_timeout_in_ms_; } |
int tap_timeout_in_ms() const { return tap_timeout_in_ms_; } |
- float scroll_friction() const { return scroll_friction_; } |
int max_fling_velocity_in_dips_s() { |
base::AutoLock autolock(lock_); |
@@ -114,7 +111,6 @@ struct ViewConfigurationData { |
int double_tap_timeout_in_ms_; |
int long_press_timeout_in_ms_; |
int tap_timeout_in_ms_; |
- float scroll_friction_; |
// These values may vary as view-specific parameters change, so read/write |
// access must be synchronized. |
@@ -158,10 +154,6 @@ int ViewConfiguration::GetTapTimeoutInMs() { |
return g_view_configuration.Get().tap_timeout_in_ms(); |
} |
-float ViewConfiguration::GetScrollFriction() { |
- return g_view_configuration.Get().scroll_friction(); |
-} |
- |
int ViewConfiguration::GetMaximumFlingVelocityInDipsPerSecond() { |
return g_view_configuration.Get().max_fling_velocity_in_dips_s(); |
} |