diff options
| author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-16 17:23:53 +0000 |
|---|---|---|
| committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-16 17:23:53 +0000 |
| commit | ce404cae8c35d9c39b328e2f7207b852f482a15f (patch) | |
| tree | 99624ecd8daa98c28eb35323aa465ca8819fd480 /remoting/host/plugin/host_script_object.cc | |
| parent | e921967a10108d9751709ff4f35abd67b49103f8 (diff) | |
| download | chromium_src-ce404cae8c35d9c39b328e2f7207b852f482a15f.zip chromium_src-ce404cae8c35d9c39b328e2f7207b852f482a15f.tar.gz chromium_src-ce404cae8c35d9c39b328e2f7207b852f482a15f.tar.bz2 | |
Making DesktopEnvironment a factory class used by ClientSession to create audio/video capturers and event executor for a pacticular desktop environment.
Other related changes:
- AudioCapturer and VideoFrameCapturer are owned by AudioScheduler and VideoScheduler correspondingly.
- Both AudioScheduler and VideoScheduler can now be stopped completely asynchronously.
- AudioScheduler::SetEnabled() changed to Pause() to match the corresponding method provided by VideoScheduler.
- ClientSession::Stop() is synchronous now.
BUG=104544
Review URL: https://chromiumcodereview.appspot.com/11778049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177161 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/plugin/host_script_object.cc')
| -rw-r--r-- | remoting/host/plugin/host_script_object.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/remoting/host/plugin/host_script_object.cc b/remoting/host/plugin/host_script_object.cc index d863899..2133b60 100644 --- a/remoting/host/plugin/host_script_object.cc +++ b/remoting/host/plugin/host_script_object.cc @@ -17,9 +17,9 @@ #include "net/base/net_util.h" #include "remoting/base/auth_token_util.h" #include "remoting/base/auto_thread.h" +#include "remoting/host/basic_desktop_environment.h" #include "remoting/host/chromoting_host.h" #include "remoting/host/chromoting_host_context.h" -#include "remoting/host/desktop_environment_factory.h" #include "remoting/host/host_config.h" #include "remoting/host/host_event_logger.h" #include "remoting/host/host_key_pair.h" @@ -214,8 +214,7 @@ void HostNPScriptObject::It2MeImpl::Connect( } // Create the desktop environment factory. - desktop_environment_factory_.reset(new DesktopEnvironmentFactory( - host_context_->input_task_runner(), host_context_->ui_task_runner())); + desktop_environment_factory_.reset(new BasicDesktopEnvironmentFactory()); // Start monitoring configured policies. policy_watcher_.reset( @@ -366,9 +365,11 @@ void HostNPScriptObject::It2MeImpl::FinishConnect( CreateHostSessionManager(network_settings, host_context_->url_request_context_getter()), host_context_->audio_task_runner(), + host_context_->input_task_runner(), host_context_->video_capture_task_runner(), host_context_->video_encode_task_runner(), - host_context_->network_task_runner()); + host_context_->network_task_runner(), + host_context_->ui_task_runner()); host_->AddStatusObserver(this); log_to_server_.reset( new LogToServer(host_, ServerLogEntry::IT2ME, signal_strategy_.get())); |