| Index: content/browser/web_contents/aura/overscroll_window_delegate.cc
|
| diff --git a/content/browser/web_contents/aura/overscroll_window_delegate.cc b/content/browser/web_contents/aura/overscroll_window_delegate.cc
|
| index ac5753d147afa85abbeb4c269f7b7e68bf7538db..06c43f3f765af4fcd9643c51abfe437a099c2623 100644
|
| --- a/content/browser/web_contents/aura/overscroll_window_delegate.cc
|
| +++ b/content/browser/web_contents/aura/overscroll_window_delegate.cc
|
| @@ -19,19 +19,17 @@ OverscrollWindowDelegate::OverscrollWindowDelegate(
|
| OverscrollControllerDelegate* delegate,
|
| const gfx::Image& image)
|
| : delegate_(delegate),
|
| - overscroll_mode_(OVERSCROLL_NONE),
|
| - delta_x_(0.f),
|
| complete_threshold_ratio_(content::GetOverscrollConfig(
|
| content::OVERSCROLL_CONFIG_HORIZ_THRESHOLD_COMPLETE)),
|
| start_threshold_touchscreen_(content::GetOverscrollConfig(
|
| content::OVERSCROLL_CONFIG_HORIZ_THRESHOLD_START_TOUCHSCREEN)),
|
| start_threshold_touchpad_(content::GetOverscrollConfig(
|
| - content::OVERSCROLL_CONFIG_HORIZ_THRESHOLD_START_TOUCHPAD)),
|
| - active_start_threshold_(0.f) {
|
| + content::OVERSCROLL_CONFIG_HORIZ_THRESHOLD_START_TOUCHPAD)) {
|
| SetImage(image);
|
| }
|
|
|
| OverscrollWindowDelegate::~OverscrollWindowDelegate() {
|
| + ResetOverscroll();
|
| }
|
|
|
| void OverscrollWindowDelegate::StartOverscroll(OverscrollSource source) {
|
|
|