diff options
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/chromoting_host.cc | 1 | ||||
| -rw-r--r-- | remoting/host/client_connection.cc | 5 | ||||
| -rw-r--r-- | remoting/host/client_connection.h | 6 | ||||
| -rw-r--r-- | remoting/host/event_executor_linux.cc | 3 | ||||
| -rw-r--r-- | remoting/host/mock_objects.h | 2 | ||||
| -rw-r--r-- | remoting/host/session_manager.cc | 2 |
6 files changed, 10 insertions, 9 deletions
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc index 113e3b0..21a95be 100644 --- a/remoting/host/chromoting_host.cc +++ b/remoting/host/chromoting_host.cc @@ -14,7 +14,6 @@ #include "remoting/host/event_executor.h" #include "remoting/host/host_config.h" #include "remoting/host/session_manager.h" -#include "remoting/protocol/messages_decoder.h" #include "remoting/protocol/jingle_chromotocol_server.h" namespace remoting { diff --git a/remoting/host/client_connection.cc b/remoting/host/client_connection.cc index 44d3fbf..8063d04 100644 --- a/remoting/host/client_connection.cc +++ b/remoting/host/client_connection.cc @@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// TODO(hclam): Remove this header once MessageDispatcher is used. +#include "remoting/base/multiple_array_input_stream.h" #include "remoting/host/client_connection.h" #include "google/protobuf/message.h" #include "net/base/io_buffer.h" -#include "remoting/protocol/messages_decoder.h" #include "remoting/protocol/util.h" namespace remoting { @@ -85,7 +86,7 @@ ClientConnection::ClientConnection() {} void ClientConnection::OnConnectionStateChange( ChromotocolConnection::State state) { if (state == ChromotocolConnection::CONNECTED) { - event_reader_.Init( + event_reader_.Init<ChromotingClientMessage>( connection_->event_channel(), NewCallback(this, &ClientConnection::OnMessageReceived)); video_writer_.Init(connection_->video_channel()); diff --git a/remoting/host/client_connection.h b/remoting/host/client_connection.h index d8cf305..69283e2 100644 --- a/remoting/host/client_connection.h +++ b/remoting/host/client_connection.h @@ -13,7 +13,7 @@ #include "base/scoped_ptr.h" #include "remoting/proto/internal.pb.h" #include "remoting/protocol/chromotocol_connection.h" -#include "remoting/protocol/stream_reader.h" +#include "remoting/protocol/message_reader.h" #include "remoting/protocol/stream_writer.h" namespace remoting { @@ -87,7 +87,7 @@ class ClientConnection : public base::RefCountedThreadSafe<ClientConnection> { // Callback for ChromotocolConnection. void OnConnectionStateChange(ChromotocolConnection::State state); - // Callback for EventsStreamReader. + // Callback for MessageReader. void OnMessageReceived(ChromotingClientMessage* message); // Process a libjingle state change event on the |loop_|. @@ -101,7 +101,7 @@ class ClientConnection : public base::RefCountedThreadSafe<ClientConnection> { // The libjingle channel used to send and receive data from the remote client. scoped_refptr<ChromotocolConnection> connection_; - EventStreamReader event_reader_; + MessageReader event_reader_; VideoStreamWriter video_writer_; // The message loop that this object runs on. diff --git a/remoting/host/event_executor_linux.cc b/remoting/host/event_executor_linux.cc index 44c4c55..6f3acf2 100644 --- a/remoting/host/event_executor_linux.cc +++ b/remoting/host/event_executor_linux.cc @@ -4,7 +4,8 @@ #include "remoting/host/event_executor_linux.h" -#include "remoting/protocol/messages_decoder.h" +#include "remoting/proto/internal.pb.h" +#include "remoting/protocol/message_decoder.h" namespace remoting { diff --git a/remoting/host/mock_objects.h b/remoting/host/mock_objects.h index b02d02f..50c94ef 100644 --- a/remoting/host/mock_objects.h +++ b/remoting/host/mock_objects.h @@ -8,7 +8,7 @@ #include "remoting/host/capturer.h" #include "remoting/host/client_connection.h" #include "remoting/host/event_executor.h" -#include "remoting/protocol/messages_decoder.h" +#include "remoting/proto/internal.pb.h" #include "testing/gmock/include/gmock/gmock.h" namespace remoting { diff --git a/remoting/host/session_manager.cc b/remoting/host/session_manager.cc index 34af1c1..a61a6bdd 100644 --- a/remoting/host/session_manager.cc +++ b/remoting/host/session_manager.cc @@ -12,7 +12,7 @@ #include "remoting/base/capture_data.h" #include "remoting/base/tracer.h" #include "remoting/host/client_connection.h" -#include "remoting/protocol/messages_decoder.h" +#include "remoting/protocol/message_decoder.h" namespace remoting { |