summaryrefslogtreecommitdiffstats
path: root/device/hid/hid.gyp
diff options
context:
space:
mode:
authorcsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-03 18:20:04 +0000
committercsharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-03 18:20:04 +0000
commit104de62a1315caeae550b83c5f9163277bdd5f9b (patch)
treeb1aea142555240fbb2bf98aad52144ae39e1d2c6 /device/hid/hid.gyp
parentb2ba2d4ddc3f87e328c7e074fd1f82d22e19f0dc (diff)
downloadchromium_src-104de62a1315caeae550b83c5f9163277bdd5f9b.zip
chromium_src-104de62a1315caeae550b83c5f9163277bdd5f9b.tar.gz
chromium_src-104de62a1315caeae550b83c5f9163277bdd5f9b.tar.bz2
Revert 281282 "Revert 281133 "chrome.hid: enrich model with repo..."
Tests still failed, undoing revert. > Revert 281133 "chrome.hid: enrich model with report IDs" > > Speculative revert to try and fix Win browser tests. > > > chrome.hid: enrich model with report IDs > > > > - add report IDs and max report size > > - don't expose sensitive usages > > > > BUG=364423 > > R=rockot@chromium.org > > TESTS=run device_unittests (HidReportDescriptorTest) > > > > Review URL: https://codereview.chromium.org/317783010 > > TBR=jracle@logitech.com > > Review URL: https://codereview.chromium.org/369923002 TBR=csharp@chromium.org Review URL: https://codereview.chromium.org/364213005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281300 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device/hid/hid.gyp')
-rw-r--r--device/hid/hid.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/device/hid/hid.gyp b/device/hid/hid.gyp
index c12845a..2db80fd 100644
--- a/device/hid/hid.gyp
+++ b/device/hid/hid.gyp
@@ -16,6 +16,8 @@
'sources': [
'device_monitor_linux.cc',
'device_monitor_linux.h',
+ 'hid_collection_info.cc',
+ 'hid_collection_info.h',
'hid_connection.cc',
'hid_connection.h',
'hid_connection_linux.cc',
@@ -40,8 +42,6 @@
'hid_service_win.h',
'hid_usage_and_page.cc',
'hid_usage_and_page.h',
- 'hid_utils_mac.cc',
- 'hid_utils_mac.h',
'input_service_linux.cc',
'input_service_linux.h',
],