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

device/hid/hid_service_mac.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/hid/hid_service_mac.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/hid/IOHIDManager.h>
 
 #include <string>
@@ skipping 125 matching lines @@
   // Note that our ownership of hid_device is implied if calling this method.
   // It is balanced in PlatformRemoveDevice.
   DCHECK(thread_checker_.CalledOnValidThread());
 
   HidDeviceInfo device_info;
   device_info.device_id = hid_device;
   device_info.vendor_id =
       GetHidIntProperty(hid_device, CFSTR(kIOHIDVendorIDKey));
   device_info.product_id =
       GetHidIntProperty(hid_device, CFSTR(kIOHIDProductIDKey));
-  device_info.usage =
-      GetHidIntProperty(hid_device, CFSTR(kIOHIDPrimaryUsageKey));
-  device_info.usage_page =
-      GetHidIntProperty(hid_device, CFSTR(kIOHIDPrimaryUsagePageKey));
   device_info.input_report_size =
       GetHidIntProperty(hid_device, CFSTR(kIOHIDMaxInputReportSizeKey));
   device_info.output_report_size =
       GetHidIntProperty(hid_device, CFSTR(kIOHIDMaxOutputReportSizeKey));
   device_info.feature_report_size =
       GetHidIntProperty(hid_device, CFSTR(kIOHIDMaxFeatureReportSizeKey));
+  CFTypeRef deviceUsagePairsRaw = IOHIDDeviceGetProperty(hid_device,

[Ken Rockot(use gerrit already), 2014/04/15 17:53:38]

nit: Please align arguments. In this case you can move hid_device to the next
line.

    hid_device,
    CFSTR(kIIOHID...));

is fine, as is:

    hid_device, CFSTR(kIOHID...));

+      CFSTR(kIOHIDDeviceUsagePairsKey));
+  CFArrayRef deviceUsagePairs = base::mac::CFCast<CFArrayRef>(
+      deviceUsagePairsRaw);
+  CFIndex deviceUsagePairsCount = CFArrayGetCount(deviceUsagePairs);
+  for (CFIndex i=0; i<deviceUsagePairsCount; i++) {

[Ken Rockot(use gerrit already), 2014/04/15 17:53:38]

nit: Please format this code. Missing whitespace ("i=0", "i<foo"). Also prefix
increment is preferred ("++i").

+    HidUsageAndPage usage_and_page;
+    CFDictionaryRef deviceUsagePair = base::mac::CFCast<CFDictionaryRef>(
+        CFArrayGetValueAtIndex(deviceUsagePairs, i));
+    CFNumberRef usage_page_raw = base::mac::CFCast<CFNumberRef>(
+        CFDictionaryGetValue(deviceUsagePair,
+                             CFSTR(kIOHIDDeviceUsagePageKey)));
+    CFNumberGetValue(usage_page_raw,
+                     kCFNumberSInt32Type,
+                     &usage_and_page.usage_page);
+    CFNumberRef usage_raw = base::mac::CFCast<CFNumberRef>(
+        CFDictionaryGetValue(deviceUsagePair,
+                             CFSTR(kIOHIDDeviceUsageKey)));
+    CFNumberGetValue(usage_raw, kCFNumberSInt32Type, &usage_and_page.usage);
+    device_info.usages.push_back(usage_and_page);
+  }
   device_info.product_name =
       GetHidStringProperty(hid_device, CFSTR(kIOHIDProductKey));
   device_info.serial_number =
       GetHidStringProperty(hid_device, CFSTR(kIOHIDSerialNumberKey));
   AddDevice(device_info);
 }
 
 void HidServiceMac::PlatformRemoveDevice(IOHIDDeviceRef hid_device) {
   DCHECK(thread_checker_.CalledOnValidThread());
   RemoveDevice(hid_device);
   CFRelease(hid_device);
 }
 
 scoped_refptr<HidConnection> HidServiceMac::Connect(
     const HidDeviceId& device_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   HidDeviceInfo device_info;
   if (!GetDeviceInfo(device_id, &device_info))
     return NULL;
   return scoped_refptr<HidConnection>(new HidConnectionMac(device_info));
 }
 
 }  // namespace device