Chromium Code Reviews| Index: device/hid/hid_device_info.h |
| diff --git a/device/hid/hid_device_info.h b/device/hid/hid_device_info.h |
| index b6659444a893c5004adfd96390a91aedf47c0da2..580040127526afa98c7a7d024394ee44fc9c76f7 100644 |
| --- a/device/hid/hid_device_info.h |
| +++ b/device/hid/hid_device_info.h |
| @@ -1,13 +1,13 @@ |
| -// Copyright (c) 2014 The Chromium Authors. All rights reserved. |
| +// 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. |
| #ifndef DEVICE_HID_HID_DEVICE_INFO_H_ |
| #define DEVICE_HID_HID_DEVICE_INFO_H_ |
| -#include <string> |
| +#include <stdint.h> |
| -#include "base/basictypes.h" |
| +#include <string> |
| namespace device { |
| @@ -16,22 +16,26 @@ enum HidBusType { |
| kHIDBusTypeBluetooth = 1, |
| }; |
| +typedef int HidDeviceId; |
| + |
| +const HidDeviceId kInvalidHidDeviceId = -1; |
| + |
| struct HidDeviceInfo { |
| HidDeviceInfo(); |
| ~HidDeviceInfo(); |
| - std::string device_id; |
| + int device_id; |
|
Mark Mentovai
2014/02/21 17:48:18
HidDeviceId, right?
Ken Rockot(use gerrit already)
2014/02/22 01:17:04
Done.
|
| HidBusType bus_type; |
| - uint16 vendor_id; |
| - uint16 product_id; |
| + uint16_t vendor_id; |
| + uint16_t product_id; |
| - size_t input_report_size; |
| - size_t output_report_size; |
| - size_t feature_report_size; |
| + int input_report_size; |
| + int output_report_size; |
| + int feature_report_size; |
| - uint16 usage_page; |
| - uint16 usage; |
| + uint16_t usage_page; |
| + uint16_t usage; |
| bool has_report_id; |
| std::string product_name; |