| Index: device/serial/serial_connection.h
|
| diff --git a/device/serial/serial_connection.h b/device/serial/serial_connection.h
|
| index aad93fb287b192bc68937ee92437b0d538c2c13a..22f48bfeedb474070732400bf0f891dfbccff770 100644
|
| --- a/device/serial/serial_connection.h
|
| +++ b/device/serial/serial_connection.h
|
| @@ -8,7 +8,7 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "device/serial/serial.mojom.h"
|
| -#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_impl.h"
|
| +#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
|
|
|
| namespace device {
|
|
|
| @@ -18,15 +18,16 @@ class ReadOnlyBuffer;
|
| class SerialIoHandler;
|
| class WritableBuffer;
|
|
|
| -class SerialConnection : public mojo::InterfaceImpl<serial::Connection> {
|
| +class SerialConnection : public serial::Connection {
|
| public:
|
| SerialConnection(scoped_refptr<SerialIoHandler> io_handler,
|
| mojo::InterfaceRequest<serial::DataSink> sink,
|
| mojo::InterfaceRequest<serial::DataSource> source,
|
| - mojo::InterfacePtr<serial::DataSourceClient> source_client);
|
| + mojo::InterfacePtr<serial::DataSourceClient> source_client,
|
| + mojo::InterfaceRequest<serial::Connection> request);
|
| ~SerialConnection() override;
|
|
|
| - // mojo::InterfaceImpl<serial::Connection> overrides.
|
| + // serial::Connection overrides.
|
| void GetInfo(
|
| const mojo::Callback<void(serial::ConnectionInfoPtr)>& callback) override;
|
| void SetOptions(serial::ConnectionOptionsPtr options,
|
| @@ -47,6 +48,8 @@ class SerialConnection : public mojo::InterfaceImpl<serial::Connection> {
|
| scoped_refptr<DataSinkReceiver> receiver_;
|
| scoped_refptr<DataSourceSender> sender_;
|
|
|
| + mojo::StrongBinding<serial::Connection> binding_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(SerialConnection);
|
| };
|
|
|
|
|