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

Unified Diff: remoting/protocol/message_reader.h

Issue 1143443003: Fix MessageReader to pass errors to the channel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « remoting/protocol/client_video_dispatcher_unittest.cc ('k') | remoting/protocol/message_reader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/message_reader.h
diff --git a/remoting/protocol/message_reader.h b/remoting/protocol/message_reader.h
index 65d52d0a8bbe5cfb34965be2ef64eb982e8220e9..97023b6bdceff3287ad73d5e659cffc291015028 100644
--- a/remoting/protocol/message_reader.h
+++ b/remoting/protocol/message_reader.h
@@ -35,6 +35,7 @@ class MessageReader : public base::NonThreadSafe {
public:
typedef base::Callback<void(scoped_ptr<CompoundBuffer>, const base::Closure&)>
MessageReceivedCallback;
+ typedef base::Callback<void(int)> ReadFailedCallback;
MessageReader();
virtual ~MessageReader();
@@ -43,16 +44,19 @@ class MessageReader : public base::NonThreadSafe {
void SetMessageReceivedCallback(const MessageReceivedCallback& callback);
// Starts reading from |socket|.
- void StartReading(net::Socket* socket);
+ void StartReading(net::Socket* socket,
+ const ReadFailedCallback& read_failed_callback);
private:
void DoRead();
void OnRead(int result);
- void HandleReadResult(int result);
+ void HandleReadResult(int result, bool* read_succeeded);
void OnDataReceived(net::IOBuffer* data, int data_size);
void RunCallback(scoped_ptr<CompoundBuffer> message);
void OnMessageDone();
+ ReadFailedCallback read_failed_callback_;
+
net::Socket* socket_;
// Set to true, when we have a socket read pending, and expecting
« no previous file with comments | « remoting/protocol/client_video_dispatcher_unittest.cc ('k') | remoting/protocol/message_reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698