Index: ui/android/overscroll_refresh.cc |
diff --git a/ui/android/overscroll_refresh.cc b/ui/android/overscroll_refresh.cc |
index 2f2af62d8cd56abe468ecb688e0675fa140b8ccc..22361e435c35b3682d7a91a254c128d84bbbc562 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,11 +49,11 @@ void OverscrollRefresh::OnScrollEnd(const gfx::Vector2dF& scroll_velocity) { |
Release(allow_activation); |
} |
-void OverscrollRefresh::OnScrollUpdateAck(bool was_consumed) { |
+void OverscrollRefresh::OnOverscrolled(bool can_navigate) { |
if (scroll_consumption_state_ != AWAITING_SCROLL_UPDATE_ACK) |
return; |
- if (was_consumed) { |
+ if (!can_navigate) { |
scroll_consumption_state_ = DISABLED; |
return; |
} |