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

Unified Diff: remoting/protocol/connection_to_client.cc

Issue 4726003: Implement InputStub in the host side for chromoting (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed Created 10 years, 1 month 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
Index: remoting/protocol/connection_to_client.cc
diff --git a/remoting/protocol/connection_to_client.cc b/remoting/protocol/connection_to_client.cc
index 417600b340b0eb2bb4a2aa29b125e76b3ab37a67..1c051c0a254a855bf79d12493ec7adcdf5231e19 100644
--- a/remoting/protocol/connection_to_client.cc
+++ b/remoting/protocol/connection_to_client.cc
@@ -7,6 +7,7 @@
#include "google/protobuf/message.h"
#include "net/base/io_buffer.h"
#include "remoting/protocol/client_control_sender.h"
+#include "remoting/protocol/host_message_dispatcher.h"
// TODO(hclam): Remove this header once MessageDispatcher is used.
#include "remoting/base/multiple_array_input_stream.h"
@@ -19,9 +20,13 @@ namespace protocol {
static const size_t kAverageUpdateStream = 10;
ConnectionToClient::ConnectionToClient(MessageLoop* message_loop,
- EventHandler* handler)
+ EventHandler* handler,
+ HostStub* host_stub,
+ InputStub* input_stub)
: loop_(message_loop),
- handler_(handler) {
+ handler_(handler),
+ host_stub_(host_stub),
+ input_stub_(input_stub) {
DCHECK(loop_);
DCHECK(handler_);
}
@@ -74,23 +79,17 @@ void ConnectionToClient::OnSessionStateChange(
protocol::Session::State state) {
if (state == protocol::Session::CONNECTED) {
client_stub_.reset(new ClientControlSender(session_->control_channel()));
- event_reader_.Init<ChromotingClientMessage>(
- session_->event_channel(),
- NewCallback(this, &ConnectionToClient::OnMessageReceived));
video_writer_.reset(VideoWriter::Create(session_->config()));
video_writer_->Init(session_);
+
+ dispatcher_.reset(new HostMessageDispatcher());
+ dispatcher_->Initialize(session_.get(), host_stub_, input_stub_);
}
loop_->PostTask(FROM_HERE,
NewRunnableMethod(this, &ConnectionToClient::StateChangeTask, state));
}
-void ConnectionToClient::OnMessageReceived(ChromotingClientMessage* message) {
- loop_->PostTask(FROM_HERE,
- NewRunnableMethod(this, &ConnectionToClient::MessageReceivedTask,
- message));
-}
-
void ConnectionToClient::StateChangeTask(protocol::Session::State state) {
DCHECK_EQ(loop_, MessageLoop::current());
@@ -114,12 +113,6 @@ void ConnectionToClient::StateChangeTask(protocol::Session::State state) {
}
}
-void ConnectionToClient::MessageReceivedTask(ChromotingClientMessage* message) {
- DCHECK_EQ(loop_, MessageLoop::current());
- DCHECK(handler_);
- handler_->HandleMessage(this, message);
-}
-
// OnClosed() is used as a callback for protocol::Session::Close().
void ConnectionToClient::OnClosed() {
}

Powered by Google App Engine
This is Rietveld 408576698