Remove video_channel() from Session interface

remoting/protocol/connection_to_client.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef REMOTING_PROTOCOL_CONNECTION_TO_CLIENT_H_
 #define REMOTING_PROTOCOL_CONNECTION_TO_CLIENT_H_
 
 #include <deque>
 #include <vector>
 
@@ skipping 72 matching lines @@
   virtual void set_input_stub(InputStub* input_stub);
 
  protected:
   friend class base::RefCountedThreadSafe<ConnectionToClient>;
   virtual ~ConnectionToClient();
 
  private:
   // Callback for protocol Session.
   void OnSessionStateChange(Session::State state);
 
+  // Callback for VideoReader::Init().
+  void OnVideoInitialized(bool successful);
+
+  void CloseOnError();
+
   // Stops writing in the channels.
   void CloseChannels();
 
-  // The libjingle channel used to send and receive data from the remote client.
-  scoped_ptr<Session> session_;
-
-  scoped_ptr<VideoWriter> video_writer_;
-
-  // ClientStub for sending messages to the client.
-  scoped_ptr<ClientControlSender> client_control_sender_;
-
   // The message loop that this object runs on.
   MessageLoop* loop_;
 
   // 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);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_CONNECTION_TO_CLIENT_H_