Remove event_channel() and control_channel() from Session interface.

Now all channels are created using CreateStreamChannel() as they should be!

Review URL: http://codereview.chromium.org/8587053

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111045 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 11 deletions

diff --git a/remoting/protocol/client_event_dispatcher.h b/remoting/protocol/client_event_dispatcher.h
index 32a570b..2e493eb 100644
--- a/remoting/protocol/client_event_dispatcher.h
+++ b/remoting/protocol/client_event_dispatcher.h
@@ -5,35 +5,30 @@
 #ifndef REMOTING_PROTOCOL_CLIENT_INPUT_DISPATCHER_H_
 #define REMOTING_PROTOCOL_CLIENT_INPUT_DISPATCHER_H_
 
-#include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
+#include "remoting/protocol/channel_dispatcher_base.h"
 #include "remoting/protocol/input_stub.h"
 
-namespace base {
-class MessageLoopProxy;
-}  // namespace base
-
 namespace remoting {
 namespace protocol {
 
 class BufferedSocketWriter;
-class Session;
 
 // ClientEventDispatcher manages the event channel on the client
 // side. It implements InputStub for outgoing input messages.
-class ClientEventDispatcher : public InputStub {
+class ClientEventDispatcher : public ChannelDispatcherBase, public InputStub {
  public:
   ClientEventDispatcher();
   virtual ~ClientEventDispatcher();
 
-  // Initialize the event channel and the dispatcher for the
-  // |session|.
-  void Init(Session* session);
-
   // InputStub implementation.
   virtual void InjectKeyEvent(const KeyEvent& event) OVERRIDE;
   virtual void InjectMouseEvent(const MouseEvent& event) OVERRIDE;
 
+ protected:
+  // ChannelDispatcherBase overrides.
+  virtual void OnInitialized() OVERRIDE;
+
  private:
   scoped_refptr<BufferedSocketWriter> writer_;