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

Unified Diff: remoting/protocol/jingle_session.h

Issue 1277093006: Enable QUIC support in chromoting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@quic_adapters
Patch Set: Created 5 years, 4 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/jingle_session.h
diff --git a/remoting/protocol/jingle_session.h b/remoting/protocol/jingle_session.h
index e3c661c0150ff70cca76d0997a78649dcb5ffb91..486b0c584dcdbc076881999fbe2e0c42e168899b 100644
--- a/remoting/protocol/jingle_session.h
+++ b/remoting/protocol/jingle_session.h
@@ -25,10 +25,11 @@
namespace remoting {
namespace protocol {
-class SecureChannelFactory;
class ChannelMultiplexer;
class JingleSessionManager;
class PseudoTcpChannelFactory;
+class QuicChannelFactory;
+class SecureChannelFactory;
// JingleSessionManager and JingleSession implement the subset of the
// Jingle protocol used in Chromoting. Instances of this class are
@@ -47,6 +48,7 @@ class JingleSession : public base::NonThreadSafe,
const SessionConfig& config() override;
StreamChannelFactory* GetTransportChannelFactory() override;
StreamChannelFactory* GetMultiplexedChannelFactory() override;
+ StreamChannelFactory* GetQuicChannelFactory() override;
void Close() override;
// DatagramChannelFactory interface.
@@ -150,6 +152,7 @@ class JingleSession : public base::NonThreadSafe,
bool is_session_active();
JingleSessionManager* session_manager_;
+ bool is_server_;
dcaiafa 2015/08/11 22:40:06 Not used. Delete?
Sergey Ulanov 2015/08/14 18:44:25 Done.
std::string peer_jid_;
Session::EventHandler* event_handler_;
@@ -171,6 +174,7 @@ class JingleSession : public base::NonThreadSafe,
scoped_ptr<PseudoTcpChannelFactory> pseudotcp_channel_factory_;
scoped_ptr<SecureChannelFactory> secure_channel_factory_;
scoped_ptr<ChannelMultiplexer> channel_multiplexer_;
+ scoped_ptr<QuicChannelFactory> quic_adapter_;
dcaiafa 2015/08/11 22:40:06 This is not really an adapter, so why not quic_cha
Sergey Ulanov 2015/08/14 18:44:25 Done.
scoped_ptr<JingleMessage> pending_transport_info_message_;
base::OneShotTimer<JingleSession> transport_info_timer_;

Powered by Google App Engine
This is Rietveld 408576698