Index: remoting/protocol/jingle_connection_to_host.h |
diff --git a/remoting/protocol/jingle_connection_to_host.h b/remoting/protocol/jingle_connection_to_host.h |
index b8b64b4b10ab218827a57a1fcd7ca21ae3791d84..8e90c5be2598ad3267f5b150ce0d22cfbad18e2b 100644 |
--- a/remoting/protocol/jingle_connection_to_host.h |
+++ b/remoting/protocol/jingle_connection_to_host.h |
@@ -37,6 +37,7 @@ class VideoPacket; |
namespace protocol { |
+class ClientMessageDispatcher; |
class VideoReader; |
class VideoStub; |
@@ -62,11 +63,11 @@ class JingleConnectionToHost : public ConnectionToHost, |
// Callback for chromotocol SessionManager. |
void OnNewSession( |
- protocol::Session* connection, |
- protocol::SessionManager::IncomingSessionResponse* response); |
+ Session* connection, |
+ SessionManager::IncomingSessionResponse* response); |
// Callback for chromotocol Session. |
- void OnSessionStateChange(protocol::Session::State state); |
+ void OnSessionStateChange(Session::State state); |
private: |
// The message loop for the jingle thread this object works on. |
@@ -76,9 +77,6 @@ class JingleConnectionToHost : public ConnectionToHost, |
// P2P connection to the host. |
void InitSession(); |
- // Callback for |control_reader_|. |
- void OnControlMessage(ControlMessage* msg); |
- |
// Callback for |video_reader_|. |
void OnVideoPacket(VideoPacket* packet); |
@@ -90,8 +88,8 @@ class JingleConnectionToHost : public ConnectionToHost, |
JingleThread* thread_; |
scoped_refptr<JingleClient> jingle_client_; |
- scoped_refptr<protocol::SessionManager> session_manager_; |
- scoped_refptr<protocol::Session> session_; |
+ scoped_refptr<SessionManager> session_manager_; |
+ scoped_refptr<Session> session_; |
MessageReader control_reader_; |
scoped_ptr<VideoReader> video_reader_; |
@@ -101,6 +99,8 @@ class JingleConnectionToHost : public ConnectionToHost, |
std::string host_jid_; |
+ scoped_ptr<ClientMessageDispatcher> dispatcher_; |
+ |
DISALLOW_COPY_AND_ASSIGN(JingleConnectionToHost); |
}; |