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

Unified Diff: device/serial/serial_device_enumerator_linux.cc

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/serial/serial_device_enumerator_linux.h ('k') | device/udev_linux/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/serial/serial_device_enumerator_linux.cc
diff --git a/device/serial/serial_device_enumerator_linux.cc b/device/serial/serial_device_enumerator_linux.cc
index f2fb9fac6779cf33a6a832ac31fc1805293e31b3..389b8035d2e872dfbbafdc72634429dec786fa0c 100644
--- a/device/serial/serial_device_enumerator_linux.cc
+++ b/device/serial/serial_device_enumerator_linux.cc
@@ -19,19 +19,7 @@ const char kVendorIDKey[] = "ID_VENDOR_ID";
const char kProductIDKey[] = "ID_MODEL_ID";
const char kProductNameKey[] = "ID_MODEL";
-struct UdevEnumerateDeleter {
- void operator()(udev_enumerate* enumerate) {
- udev_enumerate_unref(enumerate);
- }
-};
-
-struct UdevDeviceDeleter {
- void operator()(udev_device* device) { udev_device_unref(device); }
-};
-
-typedef scoped_ptr<udev_enumerate, UdevEnumerateDeleter> ScopedUdevEnumeratePtr;
-typedef scoped_ptr<udev_device, UdevDeviceDeleter> ScopedUdevDevicePtr;
-}
+} // namespace
// static
scoped_ptr<SerialDeviceEnumerator> SerialDeviceEnumerator::Create() {
@@ -100,8 +88,4 @@ mojo::Array<serial::DeviceInfoPtr> SerialDeviceEnumeratorLinux::GetDevices() {
return devices.Pass();
}
-void SerialDeviceEnumeratorLinux::UdevDeleter::operator()(udev* handle) {
- udev_unref(handle);
-}
-
} // namespace device
« no previous file with comments | « device/serial/serial_device_enumerator_linux.h ('k') | device/udev_linux/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698