summaryrefslogtreecommitdiffstats
path: root/device/hid/hid_service_linux.cc
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2014-10-23 17:21:15 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-24 00:21:27 +0000
commit62675d9fb31fb8cedc40f68e78e8445a74f362e7 (patch)
tree7ba05b92cf1a1075f9dfc1c11171e96ce683cf3d /device/hid/hid_service_linux.cc
parent55196a2b4a303ddbc46f2b63b58c725f80710c9c (diff)
downloadchromium_src-62675d9fb31fb8cedc40f68e78e8445a74f362e7.zip
chromium_src-62675d9fb31fb8cedc40f68e78e8445a74f362e7.tar.gz
chromium_src-62675d9fb31fb8cedc40f68e78e8445a74f362e7.tar.bz2
Cleanup: Merge device/udev_linux/udev.{cc,h} into device/udev_linux/scoped_udev.h.
- Update header files elsewhere. - Use ScopedUdev*Ptr classes in more places. BUG=415212 Review URL: https://codereview.chromium.org/666653002 Cr-Commit-Position: refs/heads/master@{#300999}
Diffstat (limited to 'device/hid/hid_service_linux.cc')
-rw-r--r--device/hid/hid_service_linux.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/device/hid/hid_service_linux.cc b/device/hid/hid_service_linux.cc
index e5fcb52..45688f5 100644
--- a/device/hid/hid_service_linux.cc
+++ b/device/hid/hid_service_linux.cc
@@ -20,7 +20,7 @@
#include "device/hid/hid_connection_linux.h"
#include "device/hid/hid_device_info.h"
#include "device/hid/hid_report_descriptor.h"
-#include "device/udev_linux/udev.h"
+#include "device/udev_linux/scoped_udev.h"
#if defined(OS_CHROMEOS)
#include "base/sys_info.h"
@@ -146,7 +146,7 @@ void HidServiceLinux::OnDeviceAdded(udev_device* device) {
uint32_t int_property = 0;
const char* str_property = NULL;
- udev_device *parent = udev_device_get_parent(device);
+ udev_device* parent = udev_device_get_parent(device);
if (!parent) {
return;
}