Index: remoting/protocol/host_control_dispatcher.cc |
diff --git a/remoting/protocol/host_control_dispatcher.cc b/remoting/protocol/host_control_dispatcher.cc |
index 0c19d176bd3fe38a0e46e94980fd2773666238ea..e323d095f45571cf5afb00b0c2b81d019da9a701 100644 |
--- a/remoting/protocol/host_control_dispatcher.cc |
+++ b/remoting/protocol/host_control_dispatcher.cc |
@@ -20,51 +20,47 @@ namespace protocol { |
HostControlDispatcher::HostControlDispatcher() |
: ChannelDispatcherBase(kControlChannelName), |
clipboard_stub_(nullptr), |
- host_stub_(nullptr) { |
+ host_stub_(nullptr), |
+ parser_(base::Bind(&HostControlDispatcher::OnMessageReceived, |
+ base::Unretained(this)), |
+ reader()) { |
} |
HostControlDispatcher::~HostControlDispatcher() { |
- writer_.Close(); |
-} |
- |
-void HostControlDispatcher::OnInitialized() { |
- reader_.Init(channel(), base::Bind( |
- &HostControlDispatcher::OnMessageReceived, base::Unretained(this))); |
- writer_.Init(channel(), BufferedSocketWriter::WriteFailedCallback()); |
} |
void HostControlDispatcher::SetCapabilities( |
const Capabilities& capabilities) { |
ControlMessage message; |
message.mutable_capabilities()->CopyFrom(capabilities); |
- writer_.Write(SerializeAndFrameMessage(message), base::Closure()); |
+ writer()->Write(SerializeAndFrameMessage(message), base::Closure()); |
} |
void HostControlDispatcher::SetPairingResponse( |
const PairingResponse& pairing_response) { |
ControlMessage message; |
message.mutable_pairing_response()->CopyFrom(pairing_response); |
- writer_.Write(SerializeAndFrameMessage(message), base::Closure()); |
+ writer()->Write(SerializeAndFrameMessage(message), base::Closure()); |
} |
void HostControlDispatcher::DeliverHostMessage( |
const ExtensionMessage& message) { |
ControlMessage control_message; |
control_message.mutable_extension_message()->CopyFrom(message); |
- writer_.Write(SerializeAndFrameMessage(control_message), base::Closure()); |
+ writer()->Write(SerializeAndFrameMessage(control_message), base::Closure()); |
} |
void HostControlDispatcher::InjectClipboardEvent(const ClipboardEvent& event) { |
ControlMessage message; |
message.mutable_clipboard_event()->CopyFrom(event); |
- writer_.Write(SerializeAndFrameMessage(message), base::Closure()); |
+ writer()->Write(SerializeAndFrameMessage(message), base::Closure()); |
} |
void HostControlDispatcher::SetCursorShape( |
const CursorShapeInfo& cursor_shape) { |
ControlMessage message; |
message.mutable_cursor_shape()->CopyFrom(cursor_shape); |
- writer_.Write(SerializeAndFrameMessage(message), base::Closure()); |
+ writer()->Write(SerializeAndFrameMessage(message), base::Closure()); |
} |
void HostControlDispatcher::OnMessageReceived( |