Index: content/browser/android/overscroll_controller_android.h |
diff --git a/content/browser/android/overscroll_controller_android.h b/content/browser/android/overscroll_controller_android.h |
index f049bdc2cd9200ac46d1aa52407a2eb7bcd3938c..bf3d23ef22eb555ab0280e899af20f8a320e06c0 100644 |
--- a/content/browser/android/overscroll_controller_android.h |
+++ b/content/browser/android/overscroll_controller_android.h |
@@ -10,6 +10,7 @@ |
#include "base/android/scoped_java_ref.h" |
#include "base/macros.h" |
#include "base/time/time.h" |
+#include "content/common/content_export.h" |
#include "content/common/input/input_event_ack_state.h" |
#include "ui/android/overscroll_glow.h" |
#include "ui/android/overscroll_refresh.h" |
@@ -34,8 +35,14 @@ namespace content { |
// Glue class for handling all inputs into Android-specific overscroll effects, |
// both the passive overscroll glow and the active overscroll pull-to-refresh. |
// Note that all input coordinates (both for events and overscroll) are in DIPs. |
-class OverscrollControllerAndroid : public ui::OverscrollGlowClient { |
+class CONTENT_EXPORT OverscrollControllerAndroid |
+ : public ui::OverscrollGlowClient { |
public: |
+ OverscrollControllerAndroid( |
+ ui::WindowAndroidCompositor* compositor, |
+ float dpi_scale, |
+ std::unique_ptr<ui::OverscrollGlow> glow_effect, |
+ std::unique_ptr<ui::OverscrollRefresh> refresh_effect); |
OverscrollControllerAndroid( |
ui::OverscrollRefreshHandler* overscroll_refresh_handler, |
ui::WindowAndroidCompositor* compositor, |
@@ -75,6 +82,7 @@ class OverscrollControllerAndroid : public ui::OverscrollGlowClient { |
const float dpi_scale_; |
bool enabled_; |
+ bool scroll_update_consumed_; |
aelias_OOO_until_Jul13
2017/08/11 21:50:32
This is refresh-effect specific so it should be st
sunyunjia
2017/08/18 18:44:06
Done.
|
// TODO(jdduke): Factor out a common API from the two overscroll effects. |
std::unique_ptr<ui::OverscrollGlow> glow_effect_; |