content/content_browser.gypi - Issue 181833003: [Android] Out with the Android GR, in with the new unified C++ GR

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/content_browser.gypi

Issue 181833003: [Android] Out with the Android GR, in with the new unified C++ GR (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix type count Created 6 years, 10 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/content_gesture_provider.cc ('K') | « content/browser/renderer_host/input/web_input_event_builders_android.cc ('k') | content/content_tests.gypi » ('j') | content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_browser.gypi

diff --git a/content/content_browser.gypi b/content/content_browser.gypi

index bad910dbe46ff9f3c90a5dd10117100ad601c221..722878e41dea4de4eda6bd2dcaaa35197fb85db5 100644

--- a/content/content_browser.gypi

+++ b/content/content_browser.gypi

@@ -15,6 +15,7 @@

'../third_party/zlib/zlib.gyp:zlib',

'../ui/accessibility/accessibility.gyp:accessibility',

'../ui/events/events.gyp:events_base',

+ '../ui/events/events.gyp:gesture_detection',

'../ui/gfx/gfx.gyp:gfx',

'../ui/gfx/gfx.gyp:gfx_geometry',

'../ui/resources/ui_resources.gyp:ui_resources',

@@ -872,8 +873,8 @@

'browser/renderer_host/image_transport_factory_android.h',

'browser/renderer_host/ime_adapter_android.cc',

'browser/renderer_host/ime_adapter_android.h',

- 'browser/renderer_host/input/gesture_event_packet.cc',

- 'browser/renderer_host/input/gesture_event_packet.h',

+ 'browser/renderer_host/input/content_gesture_provider.cc',

+ 'browser/renderer_host/input/content_gesture_provider.h',

'browser/renderer_host/input/gesture_event_queue.cc',

'browser/renderer_host/input/gesture_event_queue.h',

'browser/renderer_host/input/input_ack_handler.h',

@@ -883,6 +884,8 @@

'browser/renderer_host/input/input_router_impl.h',

'browser/renderer_host/input/motion_event_android.cc',

'browser/renderer_host/input/motion_event_android.h',

+ 'browser/renderer_host/input/motion_event_web.cc',

+ 'browser/renderer_host/input/motion_event_web.h',

'browser/renderer_host/input/synthetic_gesture.cc',

'browser/renderer_host/input/synthetic_gesture.h',

'browser/renderer_host/input/synthetic_gesture_controller.cc',

@@ -909,8 +912,6 @@

'browser/renderer_host/input/touch_event_queue.h',

'browser/renderer_host/input/touch_action_filter.cc',

'browser/renderer_host/input/touch_action_filter.h',

- 'browser/renderer_host/input/touch_disposition_gesture_filter.cc',

'browser/renderer_host/input/touchpad_tap_suppression_controller_aura.cc',

'browser/renderer_host/input/touchpad_tap_suppression_controller.cc',

'browser/renderer_host/input/touchpad_tap_suppression_controller.h',