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

Unified Diff: remoting/host/ipc_desktop_environment.cc

Issue 1673723002: Use IpcVideoFrameCapturer on network thread instead of capturer thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
Index: remoting/host/ipc_desktop_environment.cc
diff --git a/remoting/host/ipc_desktop_environment.cc b/remoting/host/ipc_desktop_environment.cc
index 6cbfb1a9fa3cc2db9e5559a5ddac61a4d1d7c1c8..c3952089c1caaa2b2c0f7aa71e898dc26fd849b3 100644
--- a/remoting/host/ipc_desktop_environment.cc
+++ b/remoting/host/ipc_desktop_environment.cc
@@ -28,7 +28,6 @@ namespace remoting {
IpcDesktopEnvironment::IpcDesktopEnvironment(
scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
- scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
base::WeakPtr<ClientSessionControl> client_session_control,
base::WeakPtr<DesktopSessionConnector> desktop_session_connector,
@@ -36,18 +35,13 @@ IpcDesktopEnvironment::IpcDesktopEnvironment(
bool supports_touch_events) {
DCHECK(caller_task_runner->BelongsToCurrentThread());
- desktop_session_proxy_ = new DesktopSessionProxy(audio_task_runner,
- caller_task_runner,
- io_task_runner,
- capture_task_runner,
- client_session_control,
- desktop_session_connector,
- virtual_terminal,
- supports_touch_events);
+ desktop_session_proxy_ = new DesktopSessionProxy(
+ audio_task_runner, caller_task_runner, io_task_runner,
+ client_session_control, desktop_session_connector, virtual_terminal,
+ supports_touch_events);
}
-IpcDesktopEnvironment::~IpcDesktopEnvironment() {
-}
+IpcDesktopEnvironment::~IpcDesktopEnvironment() {}
scoped_ptr<AudioCapturer> IpcDesktopEnvironment::CreateAudioCapturer() {
return desktop_session_proxy_->CreateAudioCapturer();
@@ -87,22 +81,15 @@ scoped_ptr<GnubbyAuthHandler> IpcDesktopEnvironment::CreateGnubbyAuthHandler(
IpcDesktopEnvironmentFactory::IpcDesktopEnvironmentFactory(
scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
- scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
IPC::Sender* daemon_channel)
: audio_task_runner_(audio_task_runner),
caller_task_runner_(caller_task_runner),
- capture_task_runner_(capture_task_runner),
io_task_runner_(io_task_runner),
- curtain_enabled_(false),
daemon_channel_(daemon_channel),
- next_id_(0),
- connector_factory_(this),
- supports_touch_events_(false) {
-}
+ connector_factory_(this) {}
-IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() {
-}
+IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() {}
scoped_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create(
base::WeakPtr<ClientSessionControl> client_session_control) {
@@ -111,7 +98,6 @@ scoped_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create(
return make_scoped_ptr(
new IpcDesktopEnvironment(audio_task_runner_,
caller_task_runner_,
- capture_task_runner_,
io_task_runner_,
client_session_control,
connector_factory_.GetWeakPtr(),

Powered by Google App Engine
This is Rietveld 408576698