| Index: ui/events/gesture_detection/snap_scroll_controller.h
|
| diff --git a/ui/events/gesture_detection/snap_scroll_controller.h b/ui/events/gesture_detection/snap_scroll_controller.h
|
| index ed8717bf698c3c25a2b764e2705e9ba4b2d1d972..753c2bcb20103e383fef3a58d64f20900b6f3d8a 100644
|
| --- a/ui/events/gesture_detection/snap_scroll_controller.h
|
| +++ b/ui/events/gesture_detection/snap_scroll_controller.h
|
| @@ -8,6 +8,10 @@
|
| #include "base/basictypes.h"
|
| #include "ui/events/gesture_detection/gesture_detection_export.h"
|
|
|
| +namespace gfx {
|
| +class Display;
|
| +}
|
| +
|
| namespace ui {
|
|
|
| class MotionEvent;
|
| @@ -17,15 +21,7 @@ class ZoomManager;
|
| // Controls the scroll snapping behavior based on scroll updates.
|
| class SnapScrollController {
|
| public:
|
| - struct GESTURE_DETECTION_EXPORT Config {
|
| - Config();
|
| - ~Config();
|
| - int screen_width_pixels;
|
| - int screen_height_pixels;
|
| - float device_scale_factor;
|
| - };
|
| -
|
| - explicit SnapScrollController(const Config& config);
|
| + explicit SnapScrollController(const gfx::Display& display);
|
| ~SnapScrollController();
|
|
|
| // Updates the snap scroll mode based on the given X and Y distance to be
|
| @@ -49,8 +45,6 @@ class SnapScrollController {
|
| SNAP_VERT
|
| };
|
|
|
| - static float CalculateChannelDistance(const Config& config);
|
| -
|
| float channel_distance_;
|
| SnapMode snap_scroll_mode_;
|
| float first_touch_x_;
|
|
|