diff options
author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 06:01:12 +0000 |
---|---|---|
committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 06:01:12 +0000 |
commit | 231316ac73519128e33c4cf0dcf3777cc362755a (patch) | |
tree | 52aac28e7dc43325efc860a8f8cdf64503b79c50 /remoting/host/chromoting_host.cc | |
parent | cf32b6c125778c8c116a51bc4035e39a85627aa0 (diff) | |
download | chromium_src-231316ac73519128e33c4cf0dcf3777cc362755a.zip chromium_src-231316ac73519128e33c4cf0dcf3777cc362755a.tar.gz chromium_src-231316ac73519128e33c4cf0dcf3777cc362755a.tar.bz2 |
Removed task runners from the DesktopEnviroment interface and introduced ScreenControls/ClientSessionControl interfaces.
This CL removes all task runners that used to be passed to methods of DesktopEnviroment and DesktopEnviromentFactory interfaces. Instead each object implementing these interfaces receives the set of task runners it needs in the constructor. This change makes DesktopEnviroment and DesktopEnviromentFactory interfaces cleaner and easier to implement.
Added the ScreenControls interface used by the client session to change the screen resolution. Objects implementing ScreenControls are created by DesktopEnvironment::CreateScreenControls() method.
DesktopEnviromentFactory::Create() now receives a pointer to the ClientSessionControl interface providing a way to pause, resume, and disconnect the client session. It also receives notifications about the local mouse movements to temporarily block the remote input. The ClientSessionControl interface will be hooked up to the local impit monitor and the host UI once they will be moved to DesktopEnvironment.
BUG=104544
Review URL: https://chromiumcodereview.appspot.com/12879006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/chromoting_host.cc')
-rw-r--r-- | remoting/host/chromoting_host.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc index c9579b9..0a465c4 100644 --- a/remoting/host/chromoting_host.cc +++ b/remoting/host/chromoting_host.cc @@ -142,7 +142,7 @@ void ChromotingHost::Shutdown(const base::Closure& shutdown_task) { // Disconnect all of the clients. while (!clients_.empty()) { - clients_.front()->Disconnect(); + clients_.front()->DisconnectSession(); } // Run the remaining shutdown tasks. @@ -193,7 +193,7 @@ void ChromotingHost::OnSessionAuthenticated(ClientSession* client) { while (it != clients_.end()) { ClientSession* other_client = *it++; if (other_client != client) - other_client->Disconnect(); + other_client->DisconnectSession(); } // Disconnects above must have destroyed all other clients. @@ -210,7 +210,7 @@ void ChromotingHost::OnSessionAuthenticated(ClientSession* client) { authenticating_client_ = false; if (reject_authenticating_client_) { - client->Disconnect(); + client->DisconnectSession(); } } @@ -339,7 +339,7 @@ void ChromotingHost::OnLocalMouseMoved(const SkIPoint& new_pos) { ClientList::iterator client; for (client = clients_.begin(); client != clients_.end(); ++client) { - (*client)->LocalMouseMoved(new_pos); + (*client)->OnLocalMouseMoved(new_pos); } } @@ -365,7 +365,7 @@ void ChromotingHost::DisconnectAllClients() { while (!clients_.empty()) { size_t size = clients_.size(); - clients_.front()->Disconnect(); + clients_.front()->DisconnectSession(); CHECK_EQ(clients_.size(), size - 1); } } |