Index: remoting/protocol/host_event_dispatcher.cc |
diff --git a/remoting/protocol/host_event_dispatcher.cc b/remoting/protocol/host_event_dispatcher.cc |
index 36fccc76db525dd71238b0713bce655ae0804fe4..d67f6517cc85493460fc0301e727930f4f7b286b 100644 |
--- a/remoting/protocol/host_event_dispatcher.cc |
+++ b/remoting/protocol/host_event_dispatcher.cc |
@@ -9,22 +9,22 @@ |
#include "remoting/proto/event.pb.h" |
#include "remoting/proto/internal.pb.h" |
#include "remoting/protocol/input_stub.h" |
+#include "remoting/protocol/message_serialization.h" |
namespace remoting { |
namespace protocol { |
HostEventDispatcher::HostEventDispatcher() |
- : ChannelDispatcherBase(kEventChannelName), |
- input_stub_(nullptr), |
- parser_(base::Bind(&HostEventDispatcher::OnMessageReceived, |
- base::Unretained(this)), |
- reader()) {} |
- |
+ : ChannelDispatcherBase(kEventChannelName) {} |
HostEventDispatcher::~HostEventDispatcher() {} |
-void HostEventDispatcher::OnMessageReceived(scoped_ptr<EventMessage> message) { |
+void HostEventDispatcher::OnIncomingMessage(scoped_ptr<CompoundBuffer> buffer) { |
DCHECK(input_stub_); |
+ scoped_ptr<EventMessage> message = ParseMessage<EventMessage>(buffer.get()); |
+ if (!message) |
+ return; |
+ |
if (!on_input_event_callback_.is_null()) |
on_input_event_callback_.Run(message->timestamp()); |