| Index: device/serial/serial_service_impl.h
|
| diff --git a/device/serial/serial_service_impl.h b/device/serial/serial_service_impl.h
|
| index 17d93c276618c19ed5f122b9aece92b890f9a8bc..8d78d540f664cba7c131f415caaa9f6e06c380ae 100644
|
| --- a/device/serial/serial_service_impl.h
|
| +++ b/device/serial/serial_service_impl.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop_proxy.h"
|
| +#include "device/serial/data_stream.mojom.h"
|
| #include "device/serial/serial.mojom.h"
|
| #include "device/serial/serial_connection_factory.h"
|
| #include "device/serial/serial_device_enumerator.h"
|
| @@ -35,14 +36,13 @@ class SerialServiceImpl : public mojo::InterfaceImpl<serial::SerialService> {
|
| virtual void Connect(
|
| const mojo::String& path,
|
| serial::ConnectionOptionsPtr options,
|
| - mojo::InterfaceRequest<serial::Connection> connection_request) OVERRIDE;
|
| + mojo::InterfaceRequest<serial::Connection> connection_request,
|
| + mojo::InterfaceRequest<serial::DataSink> sink,
|
| + mojo::InterfaceRequest<serial::DataSource> source) OVERRIDE;
|
|
|
| private:
|
| SerialDeviceEnumerator* GetDeviceEnumerator();
|
| bool IsValidPath(const mojo::String& path);
|
| - void OnConnected(
|
| - const mojo::Callback<void(serial::ConnectionInfoPtr)>& callback,
|
| - serial::ConnectionInfoPtr result);
|
|
|
| scoped_ptr<SerialDeviceEnumerator> device_enumerator_;
|
| scoped_refptr<SerialConnectionFactory> connection_factory_;
|
|
|