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

Unified Diff: remoting/protocol/channel_multiplexer.h

Issue 551173004: Move PseudoTCP and channel auth out of LibjingleTransportFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@clean_dgrams
Patch Set: Created 6 years, 3 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
« no previous file with comments | « remoting/protocol/channel_factory.h ('k') | remoting/protocol/channel_multiplexer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/channel_multiplexer.h
diff --git a/remoting/protocol/channel_multiplexer.h b/remoting/protocol/channel_multiplexer.h
index 924f132858d155bfbe41ad24ae73163ae0680f68..506dc4b78af48af743a4676925832ff4a0325c83 100644
--- a/remoting/protocol/channel_multiplexer.h
+++ b/remoting/protocol/channel_multiplexer.h
@@ -8,22 +8,22 @@
#include "base/memory/weak_ptr.h"
#include "remoting/proto/mux.pb.h"
#include "remoting/protocol/buffered_socket_writer.h"
-#include "remoting/protocol/channel_factory.h"
#include "remoting/protocol/message_reader.h"
+#include "remoting/protocol/stream_channel_factory.h"
namespace remoting {
namespace protocol {
-class ChannelMultiplexer : public ChannelFactory {
+class ChannelMultiplexer : public StreamChannelFactory {
public:
static const char kMuxChannelName[];
// |factory| is used to create the channel upon which to multiplex.
- ChannelMultiplexer(ChannelFactory* factory,
+ ChannelMultiplexer(StreamChannelFactory* factory,
const std::string& base_channel_name);
virtual ~ChannelMultiplexer();
- // ChannelFactory interface.
+ // StreamChannelFactory interface.
virtual void CreateChannel(const std::string& name,
const ChannelCreatedCallback& callback) OVERRIDE;
virtual void CancelChannelCreation(const std::string& name) OVERRIDE;
@@ -59,7 +59,7 @@ class ChannelMultiplexer : public ChannelFactory {
// Factory used to create |base_channel_|. Set to NULL once creation is
// finished or failed.
- ChannelFactory* base_channel_factory_;
+ StreamChannelFactory* base_channel_factory_;
// Name of the underlying channel.
std::string base_channel_name_;
« no previous file with comments | « remoting/protocol/channel_factory.h ('k') | remoting/protocol/channel_multiplexer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698