diff options
| author | reillyg <reillyg@chromium.org> | 2015-03-23 16:21:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-23 23:21:46 +0000 |
| commit | fab70f55e19d3090af7d6d51425abed3c8b3e039 (patch) | |
| tree | 14339a0d0563c6effec2324bc7030224bf7655ac /device/hid/hid_device_info.h | |
| parent | 82af6f6b968a2683de21c8dc81cf1fd72bec0322 (diff) | |
| download | chromium_src-fab70f55e19d3090af7d6d51425abed3c8b3e039.zip chromium_src-fab70f55e19d3090af7d6d51425abed3c8b3e039.tar.gz chromium_src-fab70f55e19d3090af7d6d51425abed3c8b3e039.tar.bz2 | |
Switch HidDeviceId from IORegistry path to IORegistry entry ID.
As of OS X Yosemite the IORegistry paths for Bluetooth HID devices
are no longer unique. This change switches to using the entry IDs
instead, which appear to remain unique.
BUG=452172
Review URL: https://codereview.chromium.org/1025553004
Cr-Commit-Position: refs/heads/master@{#321892}
Diffstat (limited to 'device/hid/hid_device_info.h')
| -rw-r--r-- | device/hid/hid_device_info.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/device/hid/hid_device_info.h b/device/hid/hid_device_info.h index 8096546..bc89832 100644 --- a/device/hid/hid_device_info.h +++ b/device/hid/hid_device_info.h @@ -19,8 +19,13 @@ enum HidBusType { kHIDBusTypeBluetooth = 1, }; +#if defined(OS_MACOSX) +typedef uint64_t HidDeviceId; +const uint64_t kInvalidHidDeviceId = -1; +#else typedef std::string HidDeviceId; extern const char kInvalidHidDeviceId[]; +#endif class HidDeviceInfo : public base::RefCountedThreadSafe<HidDeviceInfo> { public: |