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

Unified Diff: remoting/protocol/transport.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/stream_channel_factory.h ('k') | remoting/remoting_srcs.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/transport.h
diff --git a/remoting/protocol/transport.h b/remoting/protocol/transport.h
index eb20e12a3c382c1a7218d566402595baaf24be10..d4c4b3f8d8fa466017052c372e3764cf89c78fbc 100644
--- a/remoting/protocol/transport.h
+++ b/remoting/protocol/transport.h
@@ -87,14 +87,15 @@ class Transport : public base::NonThreadSafe {
virtual void OnTransportDeleted(Transport* transport) = 0;
};
+ typedef base::Callback<void(scoped_ptr<net::Socket>)> ConnectedCallback;
+
Transport() {}
virtual ~Transport() {}
- // Intialize the transport with the specified parameters.
- // |authenticator| is used to secure and authenticate the connection.
- virtual void Initialize(const std::string& name,
- Transport::EventHandler* event_handler,
- scoped_ptr<ChannelAuthenticator> authenticator) = 0;
+ // Connects the transport and calls the |callback| after that.
+ virtual void Connect(const std::string& name,
+ Transport::EventHandler* event_handler,
+ const ConnectedCallback& callback) = 0;
// Adds |candidate| received from the peer.
virtual void AddRemoteCandidate(const cricket::Candidate& candidate) = 0;
@@ -111,32 +112,6 @@ class Transport : public base::NonThreadSafe {
DISALLOW_COPY_AND_ASSIGN(Transport);
};
-class StreamTransport : public Transport {
- public:
- typedef base::Callback<void(scoped_ptr<net::StreamSocket>)> ConnectedCallback;
-
- StreamTransport() { }
- virtual ~StreamTransport() { }
-
- virtual void Connect(const ConnectedCallback& callback) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(StreamTransport);
-};
-
-class DatagramTransport : public Transport {
- public:
- typedef base::Callback<void(scoped_ptr<net::Socket>)> ConnectedCallback;
-
- DatagramTransport() { }
- virtual ~DatagramTransport() { }
-
- virtual void Connect(const ConnectedCallback& callback) = 0;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(DatagramTransport);
-};
-
class TransportFactory {
public:
TransportFactory() { }
@@ -148,8 +123,7 @@ class TransportFactory {
// necessary while the session is being authenticated.
virtual void PrepareTokens() = 0;
- virtual scoped_ptr<StreamTransport> CreateStreamTransport() = 0;
- virtual scoped_ptr<DatagramTransport> CreateDatagramTransport() = 0;
+ virtual scoped_ptr<Transport> CreateTransport() = 0;
private:
DISALLOW_COPY_AND_ASSIGN(TransportFactory);
« no previous file with comments | « remoting/protocol/stream_channel_factory.h ('k') | remoting/remoting_srcs.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698