Index: remoting/host/ipc_desktop_environment.h |
diff --git a/remoting/host/ipc_desktop_environment.h b/remoting/host/ipc_desktop_environment.h |
index c874337e03e57e85e958faed6bd76a26a59dd360..f2f9d9af839916ab1c370185ecae8b9d28986680 100644 |
--- a/remoting/host/ipc_desktop_environment.h |
+++ b/remoting/host/ipc_desktop_environment.h |
@@ -41,7 +41,6 @@ class IpcDesktopEnvironment : public DesktopEnvironment { |
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, |
@@ -77,7 +76,6 @@ class 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); |
~IpcDesktopEnvironmentFactory() override; |
@@ -114,14 +112,11 @@ class IpcDesktopEnvironmentFactory |
// be called. |
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_; |
- // Used to run the video capturer. |
- scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner_; |
- |
// Task runner used for running background I/O. |
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_; |
// True if curtain mode is enabled. |
- bool curtain_enabled_; |
+ bool curtain_enabled_ = false; |
// IPC channel connected to the daemon process. |
IPC::Sender* daemon_channel_; |
@@ -133,14 +128,14 @@ class IpcDesktopEnvironmentFactory |
// Next desktop session ID. IDs are allocated sequentially starting from 0. |
// This gives us more than 67 years of unique IDs assuming a new ID is |
// allocated every second. |
- int next_id_; |
- |
- // Factory for weak pointers to DesktopSessionConnector interface. |
- base::WeakPtrFactory<DesktopSessionConnector> connector_factory_; |
+ int next_id_ = 0; |
// If true then the newly Create()ed desktop environments support touch |
// events. |
joedow
2016/02/05 21:39:26
nit: Reword: Defines whether desktop environments
Sergey Ulanov
2016/02/05 21:51:20
Done. Note that this is no a new comment. I just r
|
- bool supports_touch_events_; |
+ bool supports_touch_events_ = false; |
+ |
+ // Factory for weak pointers to DesktopSessionConnector interface. |
+ base::WeakPtrFactory<DesktopSessionConnector> connector_factory_; |
DISALLOW_COPY_AND_ASSIGN(IpcDesktopEnvironmentFactory); |
}; |