Cleanup channel dispatchers

remoting/protocol/connection_to_client.h

 // Copyright (c) 2012 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 <string>
 #include <vector>
@@ skipping 13 matching lines @@
 class HostEventDispatcher;
 class HostStub;
 class HostVideoDispatcher;
 class InputStub;
 class VideoStub;
 
 // This class represents a remote viewer connection to the chromoting
 // host. It sets up all protocol channels and connects them to the
 // stubs.
 class ConnectionToClient : public base::NonThreadSafe,
-                           public Session::EventHandler {
+                           public Session::EventHandler,
+                           public ChannelDispatcherBase::EventHandler {
  public:
   class EventHandler {
    public:
     // Called when the network connection is authenticating
     virtual void OnConnectionAuthenticating(ConnectionToClient* connection) = 0;
 
     // Called when the network connection is authenticated.
     virtual void OnConnectionAuthenticated(ConnectionToClient* connection) = 0;
 
     // Called when the network connection is authenticated and all
@@ skipping 53 matching lines @@
   virtual void set_host_stub(HostStub* host_stub);
   virtual HostStub* host_stub();
   virtual void set_input_stub(InputStub* input_stub);
   virtual InputStub* input_stub();
 
   // Session::EventHandler interface.
   void OnSessionStateChange(Session::State state) override;
   void OnSessionRouteChange(const std::string& channel_name,
                             const TransportRoute& route) override;
 
+  // ChannelDispatcherBase::EventHandler interface.
+  void OnChannelInitialized(ChannelDispatcherBase* channel_dispatcher) override;
+  void OnChannelError(ChannelDispatcherBase* channel_dispatcher,
+                      ErrorCode error) override;
+
  private:
-  // Callback for channel initialization.
-  void OnChannelInitialized(bool successful);
-
   void NotifyIfChannelsReady();
 
   void Close(ErrorCode error);
 
   // Stops writing in the channels.
   void CloseChannels();
 
   // Event handler for handling events sent from this object.
   EventHandler* handler_;
 
@@ skipping 10 matching lines @@
   scoped_ptr<HostVideoDispatcher> video_dispatcher_;
   scoped_ptr<AudioWriter> audio_writer_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectionToClient);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_CONNECTION_TO_CLIENT_H_