| Index: device/serial/serial_service_impl.h
|
| diff --git a/device/serial/serial_service_impl.h b/device/serial/serial_service_impl.h
|
| index ff4cf4f81d2700d102c2c12b927a3bad25710d39..9e705a87e30c98b7af2184cf47157234a6afd156 100644
|
| --- a/device/serial/serial_service_impl.h
|
| +++ b/device/serial/serial_service_impl.h
|
| @@ -8,6 +8,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop_proxy.h"
|
| #include "device/serial/serial.mojom.h"
|
| +#include "device/serial/serial_connection_factory.h"
|
| #include "device/serial/serial_device_enumerator.h"
|
| #include "mojo/public/cpp/bindings/interface_impl.h"
|
|
|
| @@ -15,21 +16,39 @@ namespace device {
|
|
|
| class SerialServiceImpl : public mojo::InterfaceImpl<serial::SerialService> {
|
| public:
|
| - SerialServiceImpl();
|
| + explicit SerialServiceImpl(
|
| + scoped_refptr<SerialConnectionFactory> connection_factory);
|
| + SerialServiceImpl(scoped_refptr<SerialConnectionFactory> connection_factory,
|
| + scoped_ptr<SerialDeviceEnumerator> device_enumerator);
|
| virtual ~SerialServiceImpl();
|
|
|
| - static void Create(mojo::InterfaceRequest<serial::SerialService> request);
|
| + static void Create(scoped_refptr<base::MessageLoopProxy> io_message_loop,
|
| + mojo::InterfaceRequest<serial::SerialService> request);
|
| static void CreateOnMessageLoop(
|
| scoped_refptr<base::MessageLoopProxy> message_loop,
|
| + scoped_refptr<base::MessageLoopProxy> io_message_loop,
|
| mojo::InterfaceRequest<serial::SerialService> request);
|
|
|
| // mojo::InterfaceImpl<SerialService> overrides.
|
| virtual void GetDevices(const mojo::Callback<
|
| void(mojo::Array<serial::DeviceInfoPtr>)>& callback) OVERRIDE;
|
| + virtual void Connect(
|
| + const mojo::String& path,
|
| + serial::ConnectionOptionsPtr options,
|
| + mojo::InterfaceRequest<serial::Connection> connection_request) OVERRIDE;
|
| virtual void OnConnectionError() 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_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(SerialServiceImpl);
|
| };
|
|
|
| } // namespace device
|
|
|