content/browser/renderer_host/input/synthetic_gesture_target_aura.cc - Issue 613373004: Adopt ui::GestureConfiguration on Android

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: content/browser/renderer_host/input/synthetic_gesture_target_aura.cc

Issue 613373004: Adopt ui::GestureConfiguration on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Copyright Created 6 years, 2 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

« no previous file with comments | « content/browser/renderer_host/input/input_router_config_helper.cc ('k') | content/browser/renderer_host/input/touch_emulator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/input/synthetic_gesture_target_aura.cc

diff --git a/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc b/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc

index 0b4d9c8c97f6ed279874415b5d2e5a53bc7a3a17..a7626d440d484cac211bf67a849163ef1baee85f 100644

--- a/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc

+++ b/content/browser/renderer_host/input/synthetic_gesture_target_aura.cc

@@ -10,7 +10,7 @@

#include "ui/aura/window.h"

#include "ui/aura/window_tree_host.h"

#include "ui/events/event_processor.h"

-#include "ui/events/gestures/gesture_configuration.h"

+#include "ui/events/gesture_detection/gesture_configuration.h"

using blink::WebTouchEvent;

using blink::WebMouseWheelEvent;

@@ -135,11 +135,14 @@ SyntheticGestureTargetAura::GetDefaultSyntheticGestureSourceType() const {

float SyntheticGestureTargetAura::GetTouchSlopInDips() const {

// - 1 because Aura considers a pointer to be moving if it has moved at least

// 'max_touch_move_in_pixels_for_click' pixels.

- return ui::GestureConfiguration::max_touch_move_in_pixels_for_click() - 1;

+ return ui::GestureConfiguration::GetInstance()

+ ->max_touch_move_in_pixels_for_click() -

+ 1;

}

float SyntheticGestureTargetAura::GetMinScalingSpanInDips() const {

- return ui::GestureConfiguration::min_distance_for_pinch_scroll_in_pixels();

+ return ui::GestureConfiguration::GetInstance()

+ ->min_distance_for_pinch_scroll_in_pixels();

}

aura::Window* SyntheticGestureTargetAura::GetWindow() const {