Index: remoting/protocol/connection_to_client.h |
diff --git a/remoting/protocol/connection_to_client.h b/remoting/protocol/connection_to_client.h |
index b7aa052c9a298282f093bb4eb8a9b48e39bcf9b7..749ef5c1853ee84f4233185ac3f6bc12c802300e 100644 |
--- a/remoting/protocol/connection_to_client.h |
+++ b/remoting/protocol/connection_to_client.h |
@@ -55,10 +55,10 @@ class ConnectionToClient : |
virtual ~ConnectionToClient(); |
- virtual void Init(Session* session); |
+ virtual void Init(protocol::Session* session); |
// Returns the connection in use. |
- virtual Session* session(); |
+ virtual protocol::Session* session(); |
// Disconnect the client connection. This method is allowed to be called |
// more than once and calls after the first one will be ignored. |
@@ -78,15 +78,15 @@ class ConnectionToClient : |
private: |
// Callback for protocol Session. |
- void OnSessionStateChange(Session::State state); |
+ void OnSessionStateChange(protocol::Session::State state); |
// Process a libjingle state change event on the |loop_|. |
- void StateChangeTask(Session::State state); |
+ void StateChangeTask(protocol::Session::State state); |
void OnClosed(); |
// The libjingle channel used to send and receive data from the remote client. |
- scoped_refptr<Session> session_; |
+ scoped_refptr<protocol::Session> session_; |
scoped_ptr<VideoWriter> video_writer_; |