Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Unified Diff: content/content_browser.gypi

Issue 2081583002: Migrating majority of gamepad from content/browser/ to device/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Final tweaks Created 4 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
« no previous file with comments | « content/common/gamepad_user_gesture.cc ('k') | content/content_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 3ee40a548fd654f815ed2fa7f2f1a18a4f66434a..85cbae8ebd2d32c456f4beee3f30f0a0c6d6b647 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -18,6 +18,7 @@
'../device/battery/battery.gyp:device_battery',
'../device/battery/battery.gyp:device_battery_mojo_bindings',
'../device/bluetooth/bluetooth.gyp:device_bluetooth',
+ '../device/gamepad/gamepad.gyp:device_gamepad',
'../device/usb/usb.gyp:device_usb',
'../device/power_save_blocker/power_save_blocker.gyp:device_power_save_blocker',
'../device/vibration/vibration.gyp:device_vibration',
@@ -802,31 +803,10 @@
'browser/frame_host/render_widget_host_view_child_frame.h',
'browser/frame_host/render_widget_host_view_guest.cc',
'browser/frame_host/render_widget_host_view_guest.h',
- 'browser/gamepad/gamepad_consumer.h',
- 'browser/gamepad/gamepad_data_fetcher.cc',
- 'browser/gamepad/gamepad_data_fetcher.h',
- 'browser/gamepad/gamepad_platform_data_fetcher.h',
- 'browser/gamepad/gamepad_platform_data_fetcher_android.cc',
- 'browser/gamepad/gamepad_platform_data_fetcher_android.h',
- 'browser/gamepad/gamepad_platform_data_fetcher_linux.cc',
- 'browser/gamepad/gamepad_platform_data_fetcher_linux.h',
- 'browser/gamepad/gamepad_platform_data_fetcher_mac.h',
- 'browser/gamepad/gamepad_platform_data_fetcher_mac.mm',
- 'browser/gamepad/gamepad_platform_data_fetcher_win.cc',
- 'browser/gamepad/gamepad_platform_data_fetcher_win.h',
- 'browser/gamepad/gamepad_provider.cc',
- 'browser/gamepad/gamepad_provider.h',
'browser/gamepad/gamepad_service.cc',
'browser/gamepad/gamepad_service.h',
- 'browser/gamepad/gamepad_standard_mappings.cc',
- 'browser/gamepad/gamepad_standard_mappings.h',
- 'browser/gamepad/gamepad_standard_mappings_linux.cc',
- 'browser/gamepad/gamepad_standard_mappings_mac.mm',
- 'browser/gamepad/gamepad_standard_mappings_win.cc',
- 'browser/gamepad/raw_input_data_fetcher_win.cc',
- 'browser/gamepad/raw_input_data_fetcher_win.h',
- 'browser/gamepad/xbox_data_fetcher_mac.cc',
- 'browser/gamepad/xbox_data_fetcher_mac.h',
+ 'browser/gamepad/gamepad_shared_buffer_impl.cc',
+ 'browser/gamepad/gamepad_shared_buffer_impl.h',
'browser/geolocation/empty_wifi_data_provider.cc',
'browser/geolocation/empty_wifi_data_provider.h',
'browser/geolocation/geolocation_provider_impl.cc',
@@ -1869,11 +1849,6 @@
'browser/file_descriptor_info_impl.h',
]
}],
- ['OS!="win" and OS!="mac" and OS!="android" and (OS!="linux" or use_udev==0)', {
- 'sources': [
- 'browser/gamepad/gamepad_platform_data_fetcher.cc',
- ]
- }],
['debug_devtools==1', {
'defines': [
'DEBUG_DEVTOOLS=1',
@@ -1999,10 +1974,6 @@
'../device/udev_linux/udev.gyp:udev_linux',
'../media/capture/capture.gyp:capture',
],
- }, {
- 'sources!': [
- 'browser/gamepad/gamepad_platform_data_fetcher_linux.cc',
- ],
}],
['OS=="linux" and use_aura==1', {
'dependencies': [
@@ -2091,11 +2062,6 @@
'browser/geolocation/wifi_data_provider_linux.cc',
],
}],
- ['os_bsd==1', {
- 'sources/': [
- ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$'],
- ],
- }],
['use_aura==1', {
'dependencies': [
'../ui/aura/aura.gyp:aura',
« no previous file with comments | « content/common/gamepad_user_gesture.cc ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698