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

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
Index: remoting/protocol/transport.h
diff --git a/remoting/protocol/transport.h b/remoting/protocol/transport.h
index eb20e12a3c382c1a7218d566402595baaf24be10..0ccfe235f6e9bccacedb4c611d07f2434738d06a 100644
--- a/remoting/protocol/transport.h
+++ b/remoting/protocol/transport.h
@@ -87,14 +87,16 @@ 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;
+ Transport::EventHandler* event_handler) = 0;
+
+ virtual void Connect(const ConnectedCallback& callback) = 0;
Wez 2014/09/10 02:29:27 nit: Add a comment to clarify where the difference
Sergey Ulanov 2014/09/10 21:50:59 Actually we no longer need them separate. Removed
// Adds |candidate| received from the peer.
virtual void AddRemoteCandidate(const cricket::Candidate& candidate) = 0;
@@ -111,32 +113,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 +124,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);

Powered by Google App Engine
This is Rietveld 408576698