| Index: ui/android/overscroll_refresh.cc
|
| diff --git a/ui/android/overscroll_refresh.cc b/ui/android/overscroll_refresh.cc
|
| index 2f2af62d8cd56abe468ecb688e0675fa140b8ccc..60b54aa3dc127b8bcd6e509e2b23a9462e1ad429 100644
|
| --- a/ui/android/overscroll_refresh.cc
|
| +++ b/ui/android/overscroll_refresh.cc
|
| @@ -24,6 +24,12 @@ OverscrollRefresh::OverscrollRefresh(OverscrollRefreshHandler* handler)
|
| DCHECK(handler);
|
| }
|
|
|
| +OverscrollRefresh::OverscrollRefresh()
|
| + : scrolled_to_top_(true),
|
| + overflow_y_hidden_(false),
|
| + scroll_consumption_state_(DISABLED),
|
| + handler_(nullptr) {}
|
| +
|
| OverscrollRefresh::~OverscrollRefresh() {
|
| }
|
|
|
| @@ -43,15 +49,10 @@ void OverscrollRefresh::OnScrollEnd(const gfx::Vector2dF& scroll_velocity) {
|
| Release(allow_activation);
|
| }
|
|
|
| -void OverscrollRefresh::OnScrollUpdateAck(bool was_consumed) {
|
| +void OverscrollRefresh::OnOverscrolled() {
|
| if (scroll_consumption_state_ != AWAITING_SCROLL_UPDATE_ACK)
|
| return;
|
|
|
| - if (was_consumed) {
|
| - scroll_consumption_state_ = DISABLED;
|
| - return;
|
| - }
|
| -
|
| scroll_consumption_state_ = handler_->PullStart() ? ENABLED : DISABLED;
|
| }
|
|
|
|
|