| Index: remoting/protocol/stream_channel_factory.h
|
| diff --git a/remoting/protocol/channel_factory.h b/remoting/protocol/stream_channel_factory.h
|
| similarity index 58%
|
| rename from remoting/protocol/channel_factory.h
|
| rename to remoting/protocol/stream_channel_factory.h
|
| index 31bf3ec9df205cd5ebcac5f13eaf183ff50ef8f4..48088c7594676f4eb7231a53c211c2ff087c5d26 100644
|
| --- a/remoting/protocol/channel_factory.h
|
| +++ b/remoting/protocol/stream_channel_factory.h
|
| @@ -2,8 +2,10 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef REMOTING_PROTOCOL_CHANNEL_FACTORY_H_
|
| -#define REMOTING_PROTOCOL_CHANNEL_FACTORY_H_
|
| +#ifndef REMOTING_PROTOCOL_STREAM_CHANNEL_FACTORY_H_
|
| +#define REMOTING_PROTOCOL_STREAM_CHANNEL_FACTORY_H_
|
| +
|
| +#include <string>
|
|
|
| #include "base/callback.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -17,22 +19,20 @@ class StreamSocket;
|
| namespace remoting {
|
| namespace protocol {
|
|
|
| -class ChannelFactory : public base::NonThreadSafe {
|
| +class StreamChannelFactory : public base::NonThreadSafe {
|
| public:
|
| // TODO(sergeyu): Specify connection error code when channel
|
| // connection fails.
|
| typedef base::Callback<void(scoped_ptr<net::StreamSocket>)>
|
| ChannelCreatedCallback;
|
|
|
| - ChannelFactory() {}
|
| + StreamChannelFactory() {}
|
|
|
| - // Creates new channels for this connection. The specified callback is called
|
| - // when then new channel is created and connected. The callback is called with
|
| - // NULL if connection failed for any reason. Callback may be called
|
| - // synchronously, before the call returns. All channels must be destroyed
|
| - // before the factory is destroyed and CancelChannelCreation() must be called
|
| - // to cancel creation of channels for which the |callback| hasn't been called
|
| - // yet.
|
| + // Creates new channels and calls the |callback| when then new channel is
|
| + // created and connected. The |callback| is called with NULL if connection
|
| + // failed for any reason. Callback may be called synchronously, before the
|
| + // call returns. All channels must be destroyed, and CancelChannelCreation()
|
| + // called for any pending channels, before the factory is destroyed.
|
| virtual void CreateChannel(const std::string& name,
|
| const ChannelCreatedCallback& callback) = 0;
|
|
|
| @@ -42,13 +42,13 @@ class ChannelFactory : public base::NonThreadSafe {
|
| virtual void CancelChannelCreation(const std::string& name) = 0;
|
|
|
| protected:
|
| - virtual ~ChannelFactory() {}
|
| + virtual ~StreamChannelFactory() {}
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(ChannelFactory);
|
| + DISALLOW_COPY_AND_ASSIGN(StreamChannelFactory);
|
| };
|
|
|
| } // namespace protocol
|
| } // namespace remoting
|
|
|
| -#endif // REMOTING_PROTOCOL_CHANNEL_FACTORY_H_
|
| +#endif // REMOTING_PROTOCOL_STREAM_CHANNEL_FACTORY_H_
|
|
|