diff options
author | georgesak <georgesak@chromium.org> | 2015-10-28 11:49:53 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-28 18:50:49 +0000 |
commit | bedd6b96ef6b16a53432008acc865bfd82fb3e98 (patch) | |
tree | c467badd23b9d411d8b4ddd3566387595399c451 /remoting/protocol/session.h | |
parent | 3f032599dac3e05ca6f49595dae2fee9bde06ce4 (diff) | |
download | chromium_src-bedd6b96ef6b16a53432008acc865bfd82fb3e98.zip chromium_src-bedd6b96ef6b16a53432008acc865bfd82fb3e98.tar.gz chromium_src-bedd6b96ef6b16a53432008acc865bfd82fb3e98.tar.bz2 |
Revert of Add TransportSession interface to prepare for WebRTC-based transport. (patchset #4 id:60001 of https://codereview.chromium.org/1420273002/ )
Reason for revert:
Broke android build.
Original issue's description:
> Add TransportSession interface to prepare for WebRTC-based transport.
>
> Previosly JingleSession was responsible to establishing connection
> with the peer and managing list of channels. Now the new
> IceTransportSession class (that implements TransportSession interface)
> is responsible for managing list of channels and so it will be possible
> to add support for WebRTC-based transport by adding another
> TransportSession implementation.
>
> There are no functional changes in this CL.
>
> BUG=547158
>
> Committed: https://crrev.com/7a5351f4c6e407e456978f6599d475616a69fc0b
> Cr-Commit-Position: refs/heads/master@{#356588}
TBR=jamiewalch@chromium.org,sergeyu@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=547158
Review URL: https://codereview.chromium.org/1413813006
Cr-Commit-Position: refs/heads/master@{#356595}
Diffstat (limited to 'remoting/protocol/session.h')
-rw-r--r-- | remoting/protocol/session.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/remoting/protocol/session.h b/remoting/protocol/session.h index 4f068f8..6fcd2c6 100644 --- a/remoting/protocol/session.h +++ b/remoting/protocol/session.h @@ -10,11 +10,14 @@ #include "remoting/protocol/errors.h" #include "remoting/protocol/session_config.h" +namespace net { +class IPEndPoint; +} // namespace net + namespace remoting { namespace protocol { class StreamChannelFactory; -class TransportSession; struct TransportRoute; // Generic interface for Chromotocol connection used by both client and host. @@ -82,11 +85,11 @@ class Session { // Returned pointer is valid until connection is closed. virtual const SessionConfig& config() = 0; - // Returns TransportSession that can be used to create transport channels. - virtual TransportSession* GetTransportSession() = 0; - - // Channel factory for QUIC-based channels. Returns nullptr when QUIC is - // disabled for the session. + // GetTransportChannelFactory() returns a factory that creates a new transport + // channel for each logical channel. GetMultiplexedChannelFactory() channels + // share a single underlying transport channel + virtual StreamChannelFactory* GetTransportChannelFactory() = 0; + virtual StreamChannelFactory* GetMultiplexedChannelFactory() = 0; virtual StreamChannelFactory* GetQuicChannelFactory() = 0; // Closes connection. Callbacks are guaranteed not to be called |