diff options
| author | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-03 17:14:13 +0000 |
|---|---|---|
| committer | csharp@chromium.org <csharp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-03 17:14:13 +0000 |
| commit | 0eac598eeed59ebebdeb0d44e93677fbb9cb9d5a (patch) | |
| tree | 6c5033490339860687bd80a6f6a663784eddd654 /device/hid/hid_report_descriptor.h | |
| parent | c9ab4198a25ff667f69acc6c9c8dad10c81bbe64 (diff) | |
| download | chromium_src-0eac598eeed59ebebdeb0d44e93677fbb9cb9d5a.zip chromium_src-0eac598eeed59ebebdeb0d44e93677fbb9cb9d5a.tar.gz chromium_src-0eac598eeed59ebebdeb0d44e93677fbb9cb9d5a.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281282 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device/hid/hid_report_descriptor.h')
| -rw-r--r-- | device/hid/hid_report_descriptor.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/device/hid/hid_report_descriptor.h b/device/hid/hid_report_descriptor.h index 94d90ad..fa67fa4 100644 --- a/device/hid/hid_report_descriptor.h +++ b/device/hid/hid_report_descriptor.h @@ -8,8 +8,8 @@ #include <vector> #include "base/memory/linked_ptr.h" -#include "device/hid/hid_collection_info.h" #include "device/hid/hid_report_descriptor_item.h" +#include "device/hid/hid_usage_and_page.h" namespace device { @@ -25,12 +25,9 @@ class HidReportDescriptor { return items_; } - // Returns top-level collections present in the descriptor, - // together with max report sizes - void GetDetails(std::vector<HidCollectionInfo>* top_level_collections, - int* max_input_report_size, - int* max_output_report_size, - int* max_feature_report_size); + // Returns HID usages of top-level collections present in the descriptor. + void GetTopLevelCollections( + std::vector<HidUsageAndPage>* topLevelCollections); private: std::vector<linked_ptr<HidReportDescriptorItem> > items_; |