| 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 3a8d8a9ae6b83c2f7d11f99638fd4e8bc98ba1c1..0b34fe841dede3b8f983d3522c2a3e19499e21b0 100644
|
| --- a/device/serial/serial_device_enumerator_linux.h
|
| +++ b/device/serial/serial_device_enumerator_linux.h
|
| @@ -9,7 +9,6 @@
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "device/serial/serial_device_enumerator.h"
|
| -#include "device/serial/serial_device_info.h"
|
|
|
| namespace device {
|
|
|
| @@ -20,7 +19,7 @@ class SerialDeviceEnumeratorLinux : public SerialDeviceEnumerator {
|
| virtual ~SerialDeviceEnumeratorLinux();
|
|
|
| // Implementation for SerialDeviceEnumerator.
|
| - virtual void GetDevices(SerialDeviceInfoList* devices) OVERRIDE;
|
| + virtual mojo::Array<SerialDeviceInfoPtr> GetDevices() OVERRIDE;
|
|
|
| private:
|
| struct UdevDeleter {
|
| @@ -34,4 +33,4 @@ class SerialDeviceEnumeratorLinux : public SerialDeviceEnumerator {
|
|
|
| } // namespace device
|
|
|
| -#endif // DEVICE_SERIAL_SERIAL_DEVICE_ENUMERATOR_H_
|
| +#endif // DEVICE_SERIAL_SERIAL_DEVICE_ENUMERATOR_LINUX_H_
|
|
|