ui/views/controls/scrollbar/base_scroll_bar.cc - Issue 404213003: [WIP] Allow scroll events to permanently change the default gesture handler in RootView

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/controls/scrollbar/base_scroll_bar.cc

Issue 404213003: [WIP] Allow scroll events to permanently change the default gesture handler in RootView (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: friend test Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« ui/views/controls/button/custom_button.cc ('K') | « ui/views/controls/button/menu_button_unittest.cc ('k') | ui/views/controls/scrollbar/overlay_scroll_bar.cc » ('j') | ui/views/controls/slider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/controls/scrollbar/base_scroll_bar.cc

diff --git a/ui/views/controls/scrollbar/base_scroll_bar.cc b/ui/views/controls/scrollbar/base_scroll_bar.cc

index c93f48e2bb540466047de39c048ac3e03eb74de3..3a9d4517d54231cc73adf046e480a5b7534ad03f 100644

--- a/ui/views/controls/scrollbar/base_scroll_bar.cc

+++ b/ui/views/controls/scrollbar/base_scroll_bar.cc

@@ -200,13 +200,9 @@ bool BaseScrollBar::OnMouseWheel(const ui::MouseWheelEvent& event) {

void BaseScrollBar::OnGestureEvent(ui::GestureEvent* event) {

// If a fling is in progress, then stop the fling for any incoming gesture

- // event (except for the GESTURE_END event that is generated at the end of the

- // fling).

- if (scroll_animator_.get() && scroll_animator_->is_scrolling() &&

- (event->type() != ui::ET_GESTURE_END ||

- event->details().touch_points() > 1)) {

+ // event.

+ if (scroll_animator_.get() && scroll_animator_->is_scrolling())

scroll_animator_->Stop();

- }

if (event->type() == ui::ET_GESTURE_TAP_DOWN) {

ProcessPressEvent(*event);