| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "remoting/host/client_session.h" | 5 #include "remoting/host/client_session.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/message_loop_proxy.h" | 9 #include "base/message_loop_proxy.h" |
| 10 #include "media/video/capture/screen/screen_capturer.h" | 10 #include "media/video/capture/screen/screen_capturer.h" |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner, | 40 scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner, |
| 41 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner, | 41 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner, |
| 42 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, | 42 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
| 43 scoped_ptr<protocol::ConnectionToClient> connection, | 43 scoped_ptr<protocol::ConnectionToClient> connection, |
| 44 DesktopEnvironmentFactory* desktop_environment_factory, | 44 DesktopEnvironmentFactory* desktop_environment_factory, |
| 45 const base::TimeDelta& max_duration) | 45 const base::TimeDelta& max_duration) |
| 46 : event_handler_(event_handler), | 46 : event_handler_(event_handler), |
| 47 connection_(connection.Pass()), | 47 connection_(connection.Pass()), |
| 48 connection_factory_(connection_.get()), | 48 connection_factory_(connection_.get()), |
| 49 client_jid_(connection_->session()->jid()), | 49 client_jid_(connection_->session()->jid()), |
| 50 // TODO(alexeypa): delay creation of |desktop_environment_| until |
| 51 // the curtain is enabled. |
| 50 desktop_environment_(desktop_environment_factory->Create( | 52 desktop_environment_(desktop_environment_factory->Create( |
| 51 client_jid_, | 53 client_jid_, |
| 52 base::Bind(&protocol::ConnectionToClient::Disconnect, | 54 base::Bind(&protocol::ConnectionToClient::Disconnect, |
| 53 connection_factory_.GetWeakPtr()))), | 55 connection_factory_.GetWeakPtr()))), |
| 54 input_tracker_(&host_input_filter_), | 56 input_tracker_(&host_input_filter_), |
| 55 remote_input_filter_(&input_tracker_), | 57 remote_input_filter_(&input_tracker_), |
| 56 mouse_clamping_filter_(&remote_input_filter_), | 58 mouse_clamping_filter_(&remote_input_filter_), |
| 57 disable_input_filter_(mouse_clamping_filter_.input_filter()), | 59 disable_input_filter_(mouse_clamping_filter_.input_filter()), |
| 58 disable_clipboard_filter_(clipboard_echo_filter_.host_filter()), | 60 disable_clipboard_filter_(clipboard_echo_filter_.host_filter()), |
| 59 auth_input_filter_(&disable_input_filter_), | 61 auth_input_filter_(&disable_input_filter_), |
| (...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 NOTIMPLEMENTED(); | 334 NOTIMPLEMENTED(); |
| 333 return scoped_ptr<AudioEncoder>(NULL); | 335 return scoped_ptr<AudioEncoder>(NULL); |
| 334 } | 336 } |
| 335 | 337 |
| 336 // static | 338 // static |
| 337 void ClientSessionTraits::Destruct(const ClientSession* client) { | 339 void ClientSessionTraits::Destruct(const ClientSession* client) { |
| 338 client->network_task_runner_->DeleteSoon(FROM_HERE, client); | 340 client->network_task_runner_->DeleteSoon(FROM_HERE, client); |
| 339 } | 341 } |
| 340 | 342 |
| 341 } // namespace remoting | 343 } // namespace remoting |
| OLD | NEW |