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

Unified Diff: device/serial/data_sink_receiver.cc

Issue 2080513002: Deletes mojo::Callback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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/data_sink_receiver.h ('k') | device/serial/serial_connection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/serial/data_sink_receiver.cc
diff --git a/device/serial/data_sink_receiver.cc b/device/serial/data_sink_receiver.cc
index 1352829a85b7cc946202512f5bdd26bd7995a102..1ae6389d7f3f50ff9407de77eb40a39f169b5c9c 100644
--- a/device/serial/data_sink_receiver.cc
+++ b/device/serial/data_sink_receiver.cc
@@ -50,7 +50,7 @@ class DataSinkReceiver::Buffer : public ReadOnlyBuffer {
class DataSinkReceiver::DataFrame {
public:
explicit DataFrame(mojo::Array<uint8_t> data,
- const mojo::Callback<void(uint32_t, int32_t)>& callback);
+ const serial::DataSink::OnDataCallback& callback);
// Returns the number of unconsumed bytes remaining of this data frame.
uint32_t GetRemainingBytes();
@@ -67,7 +67,7 @@ class DataSinkReceiver::DataFrame {
private:
mojo::Array<uint8_t> data_;
uint32_t offset_;
- const mojo::Callback<void(uint32_t, int32_t)> callback_;
+ const serial::DataSink::OnDataCallback callback_;
};
DataSinkReceiver::DataSinkReceiver(
@@ -121,7 +121,7 @@ void DataSinkReceiver::Cancel(int32_t error) {
void DataSinkReceiver::OnData(
mojo::Array<uint8_t> data,
- const mojo::Callback<void(uint32_t, int32_t)>& callback) {
+ const serial::DataSink::OnDataCallback& callback) {
if (current_error_) {
callback.Run(0, current_error_);
return;
@@ -256,7 +256,7 @@ void DataSinkReceiver::Buffer::DoneWithError(uint32_t bytes_read,
DataSinkReceiver::DataFrame::DataFrame(
mojo::Array<uint8_t> data,
- const mojo::Callback<void(uint32_t, int32_t)>& callback)
+ const serial::DataSink::OnDataCallback& callback)
: data_(std::move(data)), offset_(0), callback_(callback) {
DCHECK_LT(0u, data_.size());
}
« no previous file with comments | « device/serial/data_sink_receiver.h ('k') | device/serial/serial_connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698