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

Side by Side Diff: device/serial/serial_connection.h

Issue 2080083002: Revert of Deletes mojo::Callback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « device/serial/data_sink_receiver.cc ('k') | device/serial/serial_connection.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef DEVICE_SERIAL_SERIAL_CONNECTION_H_ 5 #ifndef DEVICE_SERIAL_SERIAL_CONNECTION_H_
6 #define DEVICE_SERIAL_SERIAL_CONNECTION_H_ 6 #define DEVICE_SERIAL_SERIAL_CONNECTION_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 14 matching lines...) Expand all
25 class SerialConnection : public serial::Connection { 25 class SerialConnection : public serial::Connection {
26 public: 26 public:
27 SerialConnection(scoped_refptr<SerialIoHandler> io_handler, 27 SerialConnection(scoped_refptr<SerialIoHandler> io_handler,
28 mojo::InterfaceRequest<serial::DataSink> sink, 28 mojo::InterfaceRequest<serial::DataSink> sink,
29 mojo::InterfaceRequest<serial::DataSource> source, 29 mojo::InterfaceRequest<serial::DataSource> source,
30 mojo::InterfacePtr<serial::DataSourceClient> source_client, 30 mojo::InterfacePtr<serial::DataSourceClient> source_client,
31 mojo::InterfaceRequest<serial::Connection> request); 31 mojo::InterfaceRequest<serial::Connection> request);
32 ~SerialConnection() override; 32 ~SerialConnection() override;
33 33
34 // serial::Connection overrides. 34 // serial::Connection overrides.
35 void GetInfo(const GetInfoCallback& callback) override; 35 void GetInfo(
36 const mojo::Callback<void(serial::ConnectionInfoPtr)>& callback) override;
36 void SetOptions(serial::ConnectionOptionsPtr options, 37 void SetOptions(serial::ConnectionOptionsPtr options,
37 const SetOptionsCallback& callback) override; 38 const mojo::Callback<void(bool)>& callback) override;
38 void SetControlSignals(serial::HostControlSignalsPtr signals, 39 void SetControlSignals(serial::HostControlSignalsPtr signals,
39 const SetControlSignalsCallback& callback) override; 40 const mojo::Callback<void(bool)>& callback) override;
40 void GetControlSignals(const GetControlSignalsCallback& callback) override; 41 void GetControlSignals(
41 void Flush(const FlushCallback& callback) override; 42 const mojo::Callback<void(serial::DeviceControlSignalsPtr)>& callback)
43 override;
44 void Flush(const mojo::Callback<void(bool)>& callback) override;
42 45
43 private: 46 private:
44 void OnSendPipeReady(std::unique_ptr<ReadOnlyBuffer> buffer); 47 void OnSendPipeReady(std::unique_ptr<ReadOnlyBuffer> buffer);
45 void OnSendCancelled(int32_t error); 48 void OnSendCancelled(int32_t error);
46 void OnReceivePipeReady(std::unique_ptr<WritableBuffer> buffer); 49 void OnReceivePipeReady(std::unique_ptr<WritableBuffer> buffer);
47 50
48 scoped_refptr<SerialIoHandler> io_handler_; 51 scoped_refptr<SerialIoHandler> io_handler_;
49 scoped_refptr<DataSinkReceiver> receiver_; 52 scoped_refptr<DataSinkReceiver> receiver_;
50 scoped_refptr<DataSourceSender> sender_; 53 scoped_refptr<DataSourceSender> sender_;
51 54
52 mojo::StrongBinding<serial::Connection> binding_; 55 mojo::StrongBinding<serial::Connection> binding_;
53 56
54 DISALLOW_COPY_AND_ASSIGN(SerialConnection); 57 DISALLOW_COPY_AND_ASSIGN(SerialConnection);
55 }; 58 };
56 59
57 } // namespace device 60 } // namespace device
58 61
59 #endif // DEVICE_SERIAL_SERIAL_CONNECTION_H_ 62 #endif // DEVICE_SERIAL_SERIAL_CONNECTION_H_
OLDNEW
« no previous file with comments | « device/serial/data_sink_receiver.cc ('k') | device/serial/serial_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698