| Index: content/browser/android/overscroll_glow.cc
|
| diff --git a/content/browser/android/overscroll_glow.cc b/content/browser/android/overscroll_glow.cc
|
| index f4a0168cd5568e4f183f6fb620e9a7cb8d3d9982..1705863886c61f43afba1bf5fccd678df5d5d42a 100644
|
| --- a/content/browser/android/overscroll_glow.cc
|
| +++ b/content/browser/android/overscroll_glow.cc
|
| @@ -97,10 +97,7 @@ scoped_ptr<OverscrollGlow> OverscrollGlow::Create(bool enabled) {
|
| }
|
|
|
| OverscrollGlow::OverscrollGlow(bool enabled)
|
| - : enabled_(enabled),
|
| - initialized_(false),
|
| - horizontal_overscroll_enabled_(true),
|
| - vertical_overscroll_enabled_(true) {}
|
| + : enabled_(enabled), initialized_(false) {}
|
|
|
| OverscrollGlow::~OverscrollGlow() {
|
| Detach();
|
| @@ -135,15 +132,6 @@ bool OverscrollGlow::OnOverscrolled(cc::Layer* overscrolling_layer,
|
| if (size_.IsEmpty())
|
| return false;
|
|
|
| - if (!horizontal_overscroll_enabled_) {
|
| - overscroll.set_x(0);
|
| - velocity.set_x(0);
|
| - }
|
| - if (!vertical_overscroll_enabled_) {
|
| - overscroll.set_y(0);
|
| - velocity.set_y(0);
|
| - }
|
| -
|
| // Ignore sufficiently small values that won't meaningfuly affect animation.
|
| overscroll = ZeroSmallComponents(overscroll);
|
| velocity = ZeroSmallComponents(velocity);
|
|
|