summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/protocol_mock_objects.cc
diff options
context:
space:
mode:
authoralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-09 04:05:34 +0000
committeralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-09 04:05:34 +0000
commit59d3755062e8a8b7a23460785830abb7084902b7 (patch)
treef54546806369326e01f42dc6b9737144e5e167b1 /remoting/protocol/protocol_mock_objects.cc
parentb3520c076d552f69efafff85dbc96bfde14de091 (diff)
downloadchromium_src-59d3755062e8a8b7a23460785830abb7084902b7.zip
chromium_src-59d3755062e8a8b7a23460785830abb7084902b7.tar.gz
chromium_src-59d3755062e8a8b7a23460785830abb7084902b7.tar.bz2
Revert 155574 - [Chromoting] Refactoring DesktopEnvironment and moving screen/audio recorders to ClientSession.
This CL changes the way screen/audio recorders and event executors are managed. New DesktopEnvironmentFactory class is now used by ChromotingHost's owner to specify the kind of desktop environment (or virtual terminal) to be used by the host. Screen/audio recorders and event executors now owned by the ClientSession instance, so there is a separate set of recorders and stubs exists for each authenticated client session. Clients sessions can now be torn dowsn in parallel with the host shuttting down. This is the 2nd attempt to land this change. This version includes: - |ClientSession| objects are torn down asynchronously now. - |ChromotingHost| now waits until all connections are torn down before deleting the session manager. BUG=134694 TEST=remoting_unittests Review URL: https://chromiumcodereview.appspot.com/10911152 TBR=alexeypa@chromium.org Review URL: https://chromiumcodereview.appspot.com/10909143 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155616 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/protocol_mock_objects.cc')
-rw-r--r--remoting/protocol/protocol_mock_objects.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/remoting/protocol/protocol_mock_objects.cc b/remoting/protocol/protocol_mock_objects.cc
index 58f912b..a37b0d7 100644
--- a/remoting/protocol/protocol_mock_objects.cc
+++ b/remoting/protocol/protocol_mock_objects.cc
@@ -13,9 +13,11 @@ namespace protocol {
MockConnectionToClient::MockConnectionToClient(
Session* session,
- HostStub* host_stub)
+ HostStub* host_stub,
+ InputStub* input_stub)
: ConnectionToClient(session) {
set_host_stub(host_stub);
+ set_input_stub(input_stub);
}
MockConnectionToClient::~MockConnectionToClient() {}