diff options
| author | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-03 18:20:04 +0000 |
|---|---|---|
| committer | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-03 18:20:04 +0000 |
| commit | 104de62a1315caeae550b83c5f9163277bdd5f9b (patch) | |
| tree | b1aea142555240fbb2bf98aad52144ae39e1d2c6 /device/hid/hid_service_linux.cc | |
| parent | b2ba2d4ddc3f87e328c7e074fd1f82d22e19f0dc (diff) | |
| download | chromium_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_service_linux.cc')
| -rw-r--r-- | device/hid/hid_service_linux.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/device/hid/hid_service_linux.cc b/device/hid/hid_service_linux.cc index d7ab558..470afa8 100644 --- a/device/hid/hid_service_linux.cc +++ b/device/hid/hid_service_linux.cc @@ -148,7 +148,10 @@ void HidServiceLinux::OnDeviceAdded(udev_device* device) { device_file.Close(); HidReportDescriptor report_descriptor(rpt_desc.value, rpt_desc.size); - report_descriptor.GetTopLevelCollections(&device_info.usages); + report_descriptor.GetDetails(&device_info.collections, + &device_info.max_input_report_size, + &device_info.max_output_report_size, + &device_info.max_feature_report_size); AddDevice(device_info); } |