| 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..809d768c20cb3310202e4d10c14b10bb4000a3e5 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,13 @@ 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::OverscrollGlow* glow_effect,
|
| + ui::OverscrollRefresh* refresh_effect,
|
| + ui::WindowAndroidCompositor* compositor,
|
| + float dpi_scale);
|
| OverscrollControllerAndroid(
|
| ui::OverscrollRefreshHandler* overscroll_refresh_handler,
|
| ui::WindowAndroidCompositor* compositor,
|
| @@ -75,6 +81,7 @@ class OverscrollControllerAndroid : public ui::OverscrollGlowClient {
|
| const float dpi_scale_;
|
|
|
| bool enabled_;
|
| + bool scroll_update_consumed_;
|
|
|
| // TODO(jdduke): Factor out a common API from the two overscroll effects.
|
| std::unique_ptr<ui::OverscrollGlow> glow_effect_;
|
|
|