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

Unified Diff: remoting/protocol/connection_to_client.h

Issue 7508044: Remove video_channel() from Session interface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 9 years, 4 months 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
Index: remoting/protocol/connection_to_client.h
diff --git a/remoting/protocol/connection_to_client.h b/remoting/protocol/connection_to_client.h
index 296ce63ca6659023364d21a85e0b6d5a8db2bedf..e02b2ecd33dac2aabba1882b6101ad4e1dae11ba 100644
--- a/remoting/protocol/connection_to_client.h
+++ b/remoting/protocol/connection_to_client.h
@@ -90,16 +90,13 @@ class ConnectionToClient :
// Callback for protocol Session.
void OnSessionStateChange(Session::State state);
- // Stops writing in the channels.
- void CloseChannels();
+ // Callback for VideoReader::Init().
+ void OnVideoInitialized(bool successful);
- // The libjingle channel used to send and receive data from the remote client.
- scoped_ptr<Session> session_;
+ void CloseOnError();
- scoped_ptr<VideoWriter> video_writer_;
-
- // ClientStub for sending messages to the client.
- scoped_ptr<ClientControlSender> client_control_sender_;
+ // Stops writing in the channels.
+ void CloseChannels();
// The message loop that this object runs on.
MessageLoop* loop_;
@@ -107,15 +104,25 @@ class ConnectionToClient :
// Event handler for handling events sent from this object.
EventHandler* handler_;
- // HostStub for receiving control events from the client.
+ // Stubs that are called for incoming messages.
HostStub* host_stub_;
-
- // InputStub for receiving input events from the client.
InputStub* input_stub_;
- // Dispatcher for submitting messages to stubs.
+ // The libjingle channel used to send and receive data from the remote client.
+ scoped_ptr<Session> session_;
+
+ // Writers for outgoing channels.
+ scoped_ptr<VideoWriter> video_writer_;
+ scoped_ptr<ClientControlSender> client_control_sender_;
+
+ // Dispatcher for incoming messages.
scoped_ptr<HostMessageDispatcher> dispatcher_;
+ // State of the channels.
+ bool control_connected_;
+ bool input_connected_;
+ bool video_connected_;
+
DISALLOW_COPY_AND_ASSIGN(ConnectionToClient);
};

Powered by Google App Engine
This is Rietveld 408576698