Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6703)

Unified Diff: device/serial/serial_device_enumerator_linux.h

Issue 666653002: Cleanup: Merge device/udev_linux/udev.{cc,h} into device/udev_linux/scoped_udev.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/hid/hid_service_linux.cc ('k') | device/serial/serial_device_enumerator_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/serial/serial_device_enumerator_linux.h
diff --git a/device/serial/serial_device_enumerator_linux.h b/device/serial/serial_device_enumerator_linux.h
index 71eee6992de38f22c5c7aebfc4cd38123d48057e..fe3c3b8640f3abbe5ef1a638c1219528253d3a48 100644
--- a/device/serial/serial_device_enumerator_linux.h
+++ b/device/serial/serial_device_enumerator_linux.h
@@ -5,10 +5,8 @@
#ifndef DEVICE_SERIAL_SERIAL_DEVICE_ENUMERATOR_LINUX_H_
#define DEVICE_SERIAL_SERIAL_DEVICE_ENUMERATOR_LINUX_H_
-#include <libudev.h>
-
-#include "base/memory/scoped_ptr.h"
#include "device/serial/serial_device_enumerator.h"
+#include "device/udev_linux/scoped_udev.h"
namespace device {
@@ -22,11 +20,7 @@ class SerialDeviceEnumeratorLinux : public SerialDeviceEnumerator {
virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() override;
private:
- struct UdevDeleter {
- void operator()(udev* handle);
- };
-
- scoped_ptr<udev, UdevDeleter> udev_;
+ ScopedUdevPtr udev_;
DISALLOW_COPY_AND_ASSIGN(SerialDeviceEnumeratorLinux);
};
« no previous file with comments | « device/hid/hid_service_linux.cc ('k') | device/serial/serial_device_enumerator_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698