Chromium Code Reviews| Index: remoting/host/ipc_desktop_environment.cc |
| diff --git a/remoting/host/ipc_desktop_environment.cc b/remoting/host/ipc_desktop_environment.cc |
| index cccb66a8eb1f4b37fb4ab2194c919bee69ce836c..0db3cfd8cde1ed154ab4ca4fdce516e6fe69b657 100644 |
| --- a/remoting/host/ipc_desktop_environment.cc |
| +++ b/remoting/host/ipc_desktop_environment.cc |
| @@ -25,7 +25,8 @@ IpcDesktopEnvironment::IpcDesktopEnvironment( |
| scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, |
| const std::string& client_jid, |
| const base::Closure& disconnect_callback, |
| - base::WeakPtr<DesktopSessionConnector> desktop_session_connector) |
| + base::WeakPtr<DesktopSessionConnector> desktop_session_connector, |
| + bool curtain_required) |
| : caller_task_runner_(caller_task_runner), |
| connected_(false), |
| desktop_session_connector_(desktop_session_connector), |
| @@ -86,6 +87,7 @@ IpcDesktopEnvironmentFactory::IpcDesktopEnvironmentFactory( |
| IPC::Sender* daemon_channel) |
| : caller_task_runner_(caller_task_runner), |
| io_task_runner_(io_task_runner), |
| + curtain_activated_(false), |
| daemon_channel_(daemon_channel), |
| connector_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), |
| next_id_(0) { |
| @@ -94,6 +96,12 @@ IpcDesktopEnvironmentFactory::IpcDesktopEnvironmentFactory( |
| IpcDesktopEnvironmentFactory::~IpcDesktopEnvironmentFactory() { |
| } |
| +void IpcDesktopEnvironmentFactory::SetActivated(bool activated) { |
| + DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| + |
| + curtain_activated_ = activated; |
|
rmsousa
2013/03/04 21:56:36
This isn't implementing the current curtain mode i
alexeypa (please no reviews)
2013/03/04 22:16:03
Yes, I know that. I'm preparing a couple of separa
rmsousa
2013/03/04 23:33:54
Can you add a comment stating something like "This
alexeypa (please no reviews)
2013/03/05 00:19:48
Done.
|
| +} |
| + |
| scoped_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create( |
| const std::string& client_jid, |
| const base::Closure& disconnect_callback) { |
| @@ -101,7 +109,7 @@ scoped_ptr<DesktopEnvironment> IpcDesktopEnvironmentFactory::Create( |
| return scoped_ptr<DesktopEnvironment>(new IpcDesktopEnvironment( |
| caller_task_runner_, io_task_runner_, client_jid, disconnect_callback, |
| - connector_factory_.GetWeakPtr())); |
| + connector_factory_.GetWeakPtr(), curtain_activated_)); |
| } |
| bool IpcDesktopEnvironmentFactory::SupportsAudioCapture() const { |