Cleanup channel dispatchers

remoting/protocol/connection_to_host.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_HOST_H_
 #define REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_
 
 #include <set>
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "remoting/proto/internal.pb.h"
+#include "remoting/protocol/channel_dispatcher_base.h"
 #include "remoting/protocol/clipboard_filter.h"
 #include "remoting/protocol/errors.h"
 #include "remoting/protocol/input_filter.h"
 #include "remoting/protocol/message_reader.h"
 #include "remoting/protocol/monitored_video_stub.h"
 #include "remoting/protocol/session.h"
 #include "remoting/protocol/session_config.h"
 #include "remoting/protocol/session_manager.h"
 #include "remoting/signaling/signal_strategy.h"
 
@@ skipping 14 matching lines @@
 class HostStub;
 class InputStub;
 class SessionConfig;
 class TransportFactory;
 class ClientVideoDispatcher;
 class VideoStub;
 
 class ConnectionToHost : public SignalStrategy::Listener,
                          public SessionManager::Listener,
                          public Session::EventHandler,
+                         public ChannelDispatcherBase::EventHandler,
                          public base::NonThreadSafe {
  public:
   // The UI implementations maintain corresponding definitions of this
   // enumeration in webapp/client_session.js and
   // android/java/src/org/chromium/chromoting/jni/JniInterface.java. Be sure to
   // update these locations if you make any changes to the ordering.
   enum State {
     INITIALIZING,
     CONNECTING,
     AUTHENTICATED,
@@ skipping 66 matching lines @@
   void OnSessionManagerReady() override;
   void OnIncomingSession(
       Session* session,
       SessionManager::IncomingSessionResponse* response) override;
 
   // 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;
+
   // MonitoredVideoStub::EventHandler interface.
   virtual void OnVideoChannelStatus(bool active);
 
   // Return the current state of ConnectionToHost.
   State state() const;
 
  private:
-  // Callbacks for channel initialization
-  void OnChannelInitialized(bool successful);
-
   void NotifyIfChannelsReady();
 
   void CloseOnError(ErrorCode error);
 
   // Stops writing in the channels.
   void CloseChannels();
 
   void SetState(State state, ErrorCode error);
 
   std::string host_jid_;
@@ skipping 26 matching lines @@
   ErrorCode error_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ConnectionToHost);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_