diff options
author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-08 09:52:34 +0000 |
---|---|---|
committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-08 09:52:34 +0000 |
commit | 4c35f73337302284aaa503dc2d6b2172623687b5 (patch) | |
tree | 35d32d1c06d8c8fd2b87ffbe0587d1509c5ac6eb /remoting/protocol | |
parent | dd29cd42928c96b849ab5b832fbe78e1cd1cd9ef (diff) | |
download | chromium_src-4c35f73337302284aaa503dc2d6b2172623687b5.zip chromium_src-4c35f73337302284aaa503dc2d6b2172623687b5.tar.gz chromium_src-4c35f73337302284aaa503dc2d6b2172623687b5.tar.bz2 |
[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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155574 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
-rw-r--r-- | remoting/protocol/protocol_mock_objects.cc | 4 | ||||
-rw-r--r-- | remoting/protocol/protocol_mock_objects.h | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/remoting/protocol/protocol_mock_objects.cc b/remoting/protocol/protocol_mock_objects.cc index a37b0d7..58f912b 100644 --- a/remoting/protocol/protocol_mock_objects.cc +++ b/remoting/protocol/protocol_mock_objects.cc @@ -13,11 +13,9 @@ namespace protocol { MockConnectionToClient::MockConnectionToClient( Session* session, - HostStub* host_stub, - InputStub* input_stub) + HostStub* host_stub) : ConnectionToClient(session) { set_host_stub(host_stub); - set_input_stub(input_stub); } MockConnectionToClient::~MockConnectionToClient() {} diff --git a/remoting/protocol/protocol_mock_objects.h b/remoting/protocol/protocol_mock_objects.h index 5251287..e65826a 100644 --- a/remoting/protocol/protocol_mock_objects.h +++ b/remoting/protocol/protocol_mock_objects.h @@ -28,8 +28,7 @@ namespace protocol { class MockConnectionToClient : public ConnectionToClient { public: MockConnectionToClient(Session* session, - HostStub* host_stub, - InputStub* input_stub); + HostStub* host_stub); virtual ~MockConnectionToClient(); MOCK_METHOD1(Init, void(Session* session)); |