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

Unified Diff: remoting/protocol/jingle_connection_to_host.cc

Issue 4476003: Add VideoPacket struct for video packets. Refactor Decode interface to use it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged 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
« no previous file with comments | « remoting/protocol/jingle_connection_to_host.h ('k') | remoting/protocol/message_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_connection_to_host.cc
diff --git a/remoting/protocol/jingle_connection_to_host.cc b/remoting/protocol/jingle_connection_to_host.cc
index e31d351a4eba48453eeb92aed7b51f720108680a..065ae558838ed0d6b04b699577596db57e0b1183 100644
--- a/remoting/protocol/jingle_connection_to_host.cc
+++ b/remoting/protocol/jingle_connection_to_host.cc
@@ -64,8 +64,10 @@ void JingleConnectionToHost::Disconnect() {
}
}
-void JingleConnectionToHost::OnControlMessage(ChromotingHostMessage* msg) {
- event_callback_->HandleMessage(this, msg);
+void JingleConnectionToHost::OnControlMessage(ControlMessage* msg) {
+ // TODO(sergeyu): Remove this method and pass ClientStub to the control
+ // stream dispatcher.
+ delete msg;
}
void JingleConnectionToHost::InitSession() {
@@ -112,6 +114,10 @@ void JingleConnectionToHost::OnServerClosed() {
}
}
+const SessionConfig* JingleConnectionToHost::config() {
+ return session_->config();
+}
+
void JingleConnectionToHost::SendEvent(const ChromotingClientMessage& msg) {
// This drops the message if we are not connected yet.
event_writer_.SendMessage(msg);
@@ -156,7 +162,7 @@ void JingleConnectionToHost::OnSessionStateChange(
case protocol::Session::CONNECTED:
// Initialize reader and writer.
- control_reader_.Init<ChromotingHostMessage>(
+ control_reader_.Init<ControlMessage>(
session_->control_channel(),
NewCallback(this, &JingleConnectionToHost::OnControlMessage));
event_writer_.Init(session_->event_channel());
« no previous file with comments | « remoting/protocol/jingle_connection_to_host.h ('k') | remoting/protocol/message_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698