chrome.hid : enrich device info with Top-Level collections usages

device/hid/hid_device_info.h

Index: device/hid/hid_device_info.h
diff --git a/device/hid/hid_device_info.h b/device/hid/hid_device_info.h
index 7531042156b8aef676ddfa90d1d01d85c8de99d0..3d785d52febe537d6a348b064a41aad8236db787 100644
--- a/device/hid/hid_device_info.h
+++ b/device/hid/hid_device_info.h
@@ -8,6 +8,7 @@
 #include <stdint.h>
 
 #include <string>
+#include <vector>
 
 #include "build/build_config.h"
 
@@ -30,6 +31,14 @@ typedef std::string HidDeviceId;
 extern const char kInvalidHidDeviceId[];
 #endif
 
+struct HidUsageAndPage {

[scheib, 2014/04/04 20:06:11]

[optional] This would be cleaner if nested inside HidDeviceInfo.

+  HidUsageAndPage();
+  ~HidUsageAndPage();
+
+  uint16_t usage_page;
+  uint16_t usage;
+};
+
 struct HidDeviceInfo {
   HidDeviceInfo();
   ~HidDeviceInfo();
@@ -43,9 +52,7 @@ struct HidDeviceInfo {
   int input_report_size;
   int output_report_size;
   int feature_report_size;
-
-  uint16_t usage_page;
-  uint16_t usage;
+  std::vector<HidUsageAndPage> usages;
   bool has_report_id;
 
   std::string product_name;