| Index: device/hid/hid_service_mac.cc
|
| diff --git a/device/hid/hid_service_mac.cc b/device/hid/hid_service_mac.cc
|
| index 3dd8019db851f34fea2083ae0bf37ef147bc96f2..dbb7737d84edef3fbe4e66438e937b0f51fc06b4 100644
|
| --- a/device/hid/hid_service_mac.cc
|
| +++ b/device/hid/hid_service_mac.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include <CoreFoundation/CoreFoundation.h>
|
| #include <IOKit/hid/IOHIDDevice.h>
|
| +#include <stdint.h>
|
|
|
| #include <set>
|
| #include <string>
|
| @@ -67,14 +68,14 @@ std::string GetHidStringProperty(IOHIDDeviceRef device, CFStringRef key) {
|
|
|
| bool TryGetHidDataProperty(IOHIDDeviceRef device,
|
| CFStringRef key,
|
| - std::vector<uint8>* result) {
|
| + std::vector<uint8_t>* result) {
|
| CFDataRef ref =
|
| base::mac::CFCast<CFDataRef>(IOHIDDeviceGetProperty(device, key));
|
| if (!ref) {
|
| return false;
|
| }
|
| STLClearObject(result);
|
| - const uint8* bytes = CFDataGetBytePtr(ref);
|
| + const uint8_t* bytes = CFDataGetBytePtr(ref);
|
| result->insert(result->begin(), bytes, bytes + CFDataGetLength(ref));
|
| return true;
|
| }
|
| @@ -251,7 +252,7 @@ scoped_refptr<HidDeviceInfo> HidServiceMac::CreateDeviceInfo(
|
| return nullptr;
|
| }
|
|
|
| - std::vector<uint8> report_descriptor;
|
| + std::vector<uint8_t> report_descriptor;
|
| if (!TryGetHidDataProperty(hid_device, CFSTR(kIOHIDReportDescriptorKey),
|
| &report_descriptor)) {
|
| HID_LOG(DEBUG) << "Device report descriptor not available.";
|
|
|