summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/connection_to_host.h
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-30 23:23:30 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-30 23:23:30 +0000
commit86dbc72dd6030f7796ac602279fab6ad85eeca60 (patch)
tree6f4eafd5ed6d7b00437f23bf2c797b841783a8b8 /remoting/protocol/connection_to_host.h
parent44d461e80c337d7baa8b9b9055d3b17ee7bc66b6 (diff)
downloadchromium_src-86dbc72dd6030f7796ac602279fab6ad85eeca60.zip
chromium_src-86dbc72dd6030f7796ac602279fab6ad85eeca60.tar.gz
chromium_src-86dbc72dd6030f7796ac602279fab6ad85eeca60.tar.bz2
Close all writers before JingleSession is destroyed.
BUG=None TEST=None Review URL: http://codereview.chromium.org/7218061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91225 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/connection_to_host.h')
-rw-r--r--remoting/protocol/connection_to_host.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/remoting/protocol/connection_to_host.h b/remoting/protocol/connection_to_host.h
index 6132fb9..a943ff6 100644
--- a/remoting/protocol/connection_to_host.h
+++ b/remoting/protocol/connection_to_host.h
@@ -13,8 +13,6 @@
#include "remoting/jingle_glue/signal_strategy.h"
#include "remoting/proto/internal.pb.h"
#include "remoting/protocol/connection_to_host.h"
-#include "remoting/protocol/host_stub.h"
-#include "remoting/protocol/input_stub.h"
#include "remoting/protocol/message_reader.h"
#include "remoting/protocol/session.h"
#include "remoting/protocol/session_manager.h"
@@ -36,7 +34,12 @@ class VideoPacket;
namespace protocol {
class ClientMessageDispatcher;
+class ClientControlSender;
class ClientStub;
+class HostControlSender;
+class HostStub;
+class InputSender;
+class InputStub;
class SessionConfig;
class VideoReader;
class VideoStub;
@@ -119,6 +122,9 @@ class ConnectionToHost : public SignalStrategy::StatusObserver {
// Callback for |video_reader_|.
void OnVideoPacket(VideoPacket* packet);
+ // Stops writing in the channels.
+ void CloseChannels();
+
// Used by Disconnect() to disconnect chromoting connection, stop chromoting
// server, and then disconnect XMPP connection.
void OnDisconnected(const base::Closure& shutdown_task);
@@ -152,13 +158,13 @@ class ConnectionToHost : public SignalStrategy::StatusObserver {
// User input event channel interface
// Stub for sending input event messages to the host.
- scoped_ptr<InputStub> input_stub_;
+ scoped_ptr<InputSender> input_sender_;
////////////////////////////////////////////////////////////////////////////
// Protocol control channel interface
// Stub for sending control messages to the host.
- scoped_ptr<HostStub> host_stub_;
+ scoped_ptr<HostControlSender> host_control_sender_;
// Stub for receiving control messages from the host.
ClientStub* client_stub_;