diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-09 23:22:20 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-09 23:22:20 +0000 |
commit | 3adf1b2a65a85ff7d4b55cd57a4e400f104d27dd (patch) | |
tree | 235aee1f595583297e057b058a29d2ed24d9da92 /remoting/protocol/jingle_connection_to_host.cc | |
parent | 9db9173baebf27623ce30770696f84a3fec74259 (diff) | |
download | chromium_src-3adf1b2a65a85ff7d4b55cd57a4e400f104d27dd.zip chromium_src-3adf1b2a65a85ff7d4b55cd57a4e400f104d27dd.tar.gz chromium_src-3adf1b2a65a85ff7d4b55cd57a4e400f104d27dd.tar.bz2 |
Add VideoPacket struct for video packets. Refactor Decode interface to use it.
Various cleanups.
BUG=None
TEST=Unittests.
Review URL: http://codereview.chromium.org/4476003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/jingle_connection_to_host.cc')
-rw-r--r-- | remoting/protocol/jingle_connection_to_host.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/remoting/protocol/jingle_connection_to_host.cc b/remoting/protocol/jingle_connection_to_host.cc index e31d351..065ae55 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()); |