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

Unified Diff: remoting/protocol/connection_to_host.h

Issue 7218061: Close all writers before JingleSession is destroyed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix tests Created 9 years, 6 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/connection_to_client_unittest.cc ('k') | remoting/protocol/connection_to_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/connection_to_host.h
diff --git a/remoting/protocol/connection_to_host.h b/remoting/protocol/connection_to_host.h
index 6132fb9d746812baa68af1745bf4c218e9a260f0..a943ff666a20961e96ab54854d5ab142ccbdf3c2 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_;
« no previous file with comments | « remoting/protocol/connection_to_client_unittest.cc ('k') | remoting/protocol/connection_to_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698