content/browser/renderer_host/render_widget_host_view_aura_unittest.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/render_widget_host_view_aura_unittest.cc

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

Patch Set: Move all the methods to superclass 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

« content/browser/renderer_host/input/input_router_config_helper.cc ('K') | « content/browser/renderer_host/render_widget_host_view_android.cc ('k') | content/public/test/browser_test_utils.cc » ('j') | ui/events/gesture_detection/gesture_configuration.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

index 589135a9637900549ff3aa88e8eb5e2fdbc39327..46d61c1991b5edcc76ac72cf6283cd2c059988f7 100644

--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

@@ -52,7 +52,7 @@

#include "ui/compositor/test/draw_waiter_for_test.h"

#include "ui/events/event.h"

#include "ui/events/event_utils.h"

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

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

#include "ui/events/test/event_generator.h"

#include "ui/wm/core/default_activation_client.h"

@@ -417,7 +417,7 @@ class RenderWidgetHostViewAuraOverscrollTest

void SetUpOverscrollEnvironment() { SetUpOverscrollEnvironmentImpl(0); }

void SetUpOverscrollEnvironmentImpl(int debounce_interval_in_ms) {

- ui::GestureConfiguration::set_scroll_debounce_interval_in_ms(

+ ui::GestureConfiguration::GetInstance()->set_scroll_debounce_interval_in_ms(

debounce_interval_in_ms);

RenderWidgetHostViewAuraTest::SetUp();