| Index: chrome/browser/extensions/api/serial/serial_connection.h
|
| diff --git a/chrome/browser/extensions/api/serial/serial_connection.h b/chrome/browser/extensions/api/serial/serial_connection.h
|
| index e7c40f419d1c82dcca1a0daa02761e8c9b210b61..c6b914a8dfd51d544907193f483c5d771bf3f438 100644
|
| --- a/chrome/browser/extensions/api/serial/serial_connection.h
|
| +++ b/chrome/browser/extensions/api/serial/serial_connection.h
|
| @@ -142,11 +142,10 @@ class SerialConnection : public ApiResource,
|
| void OnSendTimeout();
|
|
|
| // Receives read completion notification from the |io_handler_|.
|
| - void OnAsyncReadComplete(const std::string& data,
|
| - api::serial::ReceiveError error);
|
| + void OnAsyncReadComplete(const std::string& data, device::ReceiveError error);
|
|
|
| // Receives write completion notification from the |io_handler_|.
|
| - void OnAsyncWriteComplete(int bytes_sent, api::serial::SendError error);
|
| + void OnAsyncWriteComplete(int bytes_sent, device::SendError error);
|
|
|
| // The pathname of the serial device.
|
| std::string port_;
|
| @@ -193,4 +192,24 @@ class SerialConnection : public ApiResource,
|
|
|
| } // namespace extensions
|
|
|
| +namespace mojo {
|
| +
|
| +template <>
|
| +class TypeConverter<device::HostControlSignalsPtr,
|
| + extensions::api::serial::HostControlSignals> {
|
| + public:
|
| + static device::HostControlSignalsPtr ConvertFrom(
|
| + const extensions::api::serial::HostControlSignals& input);
|
| +};
|
| +
|
| +template <>
|
| +class TypeConverter<device::ConnectionOptionsPtr,
|
| + extensions::api::serial::ConnectionOptions> {
|
| + public:
|
| + static device::ConnectionOptionsPtr ConvertFrom(
|
| + const extensions::api::serial::ConnectionOptions& input);
|
| +};
|
| +
|
| +} // namespace mojo
|
| +
|
| #endif // CHROME_BROWSER_EXTENSIONS_API_SERIAL_SERIAL_CONNECTION_H_
|
|
|