Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6050)

Unified Diff: device/serial/serial_connection.cc

Issue 889283002: Remove Client= from device/serial/data_stream.mojom. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: This time without racing message pipes Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/serial/serial_connection.h ('k') | device/serial/serial_connection_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/serial/serial_connection.cc
diff --git a/device/serial/serial_connection.cc b/device/serial/serial_connection.cc
index 0d3e4171c84b64a74c2f9807322448548ecff5bd..30e8fa65fbf3f1ebcfac56416c576865c58b3b53 100644
--- a/device/serial/serial_connection.cc
+++ b/device/serial/serial_connection.cc
@@ -15,20 +15,18 @@ namespace device {
SerialConnection::SerialConnection(
scoped_refptr<SerialIoHandler> io_handler,
mojo::InterfaceRequest<serial::DataSink> sink,
- mojo::InterfaceRequest<serial::DataSource> source)
+ mojo::InterfaceRequest<serial::DataSource> source,
+ mojo::InterfacePtr<serial::DataSourceClient> source_client)
: io_handler_(io_handler) {
- receiver_ = mojo::WeakBindToRequest(
- new DataSinkReceiver(base::Bind(&SerialConnection::OnSendPipeReady,
- base::Unretained(this)),
- base::Bind(&SerialConnection::OnSendCancelled,
- base::Unretained(this)),
- base::Bind(base::DoNothing)),
- &sink);
- sender_ = mojo::WeakBindToRequest(
- new DataSourceSender(base::Bind(&SerialConnection::OnReceivePipeReady,
- base::Unretained(this)),
- base::Bind(base::DoNothing)),
- &source);
+ receiver_ = new DataSinkReceiver(
+ sink.Pass(),
+ base::Bind(&SerialConnection::OnSendPipeReady, base::Unretained(this)),
+ base::Bind(&SerialConnection::OnSendCancelled, base::Unretained(this)),
+ base::Bind(base::DoNothing));
+ sender_ = new DataSourceSender(
+ source.Pass(), source_client.Pass(),
+ base::Bind(&SerialConnection::OnReceivePipeReady, base::Unretained(this)),
+ base::Bind(base::DoNothing));
}
SerialConnection::~SerialConnection() {
« no previous file with comments | « device/serial/serial_connection.h ('k') | device/serial/serial_connection_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698