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

Side by Side 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, 1 month 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef DEVICE_SERIAL_SERIAL_DEVICE_ENUMERATOR_LINUX_H_ 5 #ifndef DEVICE_SERIAL_SERIAL_DEVICE_ENUMERATOR_LINUX_H_
6 #define DEVICE_SERIAL_SERIAL_DEVICE_ENUMERATOR_LINUX_H_ 6 #define DEVICE_SERIAL_SERIAL_DEVICE_ENUMERATOR_LINUX_H_
7 7
8 #include <libudev.h>
9
10 #include "base/memory/scoped_ptr.h"
11 #include "device/serial/serial_device_enumerator.h" 8 #include "device/serial/serial_device_enumerator.h"
9 #include "device/udev_linux/scoped_udev.h"
12 10
13 namespace device { 11 namespace device {
14 12
15 // Discovers and enumerates serial devices available to the host. 13 // Discovers and enumerates serial devices available to the host.
16 class SerialDeviceEnumeratorLinux : public SerialDeviceEnumerator { 14 class SerialDeviceEnumeratorLinux : public SerialDeviceEnumerator {
17 public: 15 public:
18 SerialDeviceEnumeratorLinux(); 16 SerialDeviceEnumeratorLinux();
19 virtual ~SerialDeviceEnumeratorLinux(); 17 virtual ~SerialDeviceEnumeratorLinux();
20 18
21 // Implementation for SerialDeviceEnumerator. 19 // Implementation for SerialDeviceEnumerator.
22 virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() override; 20 virtual mojo::Array<serial::DeviceInfoPtr> GetDevices() override;
23 21
24 private: 22 private:
25 struct UdevDeleter { 23 ScopedUdevPtr udev_;
26 void operator()(udev* handle);
27 };
28
29 scoped_ptr<udev, UdevDeleter> udev_;
30 24
31 DISALLOW_COPY_AND_ASSIGN(SerialDeviceEnumeratorLinux); 25 DISALLOW_COPY_AND_ASSIGN(SerialDeviceEnumeratorLinux);
32 }; 26 };
33 27
34 } // namespace device 28 } // namespace device
35 29
36 #endif // DEVICE_SERIAL_SERIAL_DEVICE_ENUMERATOR_LINUX_H_ 30 #endif // DEVICE_SERIAL_SERIAL_DEVICE_ENUMERATOR_LINUX_H_
OLDNEW
« 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