| 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 "remoting/codec/audio_encoder.h" | 10 #include "remoting/codec/audio_encoder.h" |
| 11 #include "remoting/codec/audio_encoder_speex.h" | 11 #include "remoting/codec/audio_encoder_speex.h" |
| 12 #include "remoting/codec/audio_encoder_verbatim.h" | 12 #include "remoting/codec/audio_encoder_verbatim.h" |
| 13 #include "remoting/codec/video_encoder.h" | 13 #include "remoting/codec/video_encoder.h" |
| 14 #include "remoting/codec/video_encoder_row_based.h" | 14 #include "remoting/codec/video_encoder_row_based.h" |
| 15 #include "remoting/codec/video_encoder_vp8.h" | 15 #include "remoting/codec/video_encoder_vp8.h" |
| 16 #include "remoting/host/audio_scheduler.h" | 16 #include "remoting/host/audio_scheduler.h" |
| 17 #include "remoting/host/desktop_environment.h" | 17 #include "remoting/host/desktop_environment.h" |
| 18 #include "remoting/host/desktop_environment_factory.h" |
| 18 #include "remoting/host/event_executor.h" | 19 #include "remoting/host/event_executor.h" |
| 19 #include "remoting/host/screen_recorder.h" | 20 #include "remoting/host/screen_recorder.h" |
| 20 #include "remoting/host/video_frame_capturer.h" | 21 #include "remoting/host/video_frame_capturer.h" |
| 21 #include "remoting/proto/control.pb.h" | 22 #include "remoting/proto/control.pb.h" |
| 22 #include "remoting/proto/event.pb.h" | 23 #include "remoting/proto/event.pb.h" |
| 23 #include "remoting/protocol/client_stub.h" | 24 #include "remoting/protocol/client_stub.h" |
| 24 #include "remoting/protocol/clipboard_thread_proxy.h" | 25 #include "remoting/protocol/clipboard_thread_proxy.h" |
| 25 | 26 |
| 26 namespace remoting { | 27 namespace remoting { |
| 27 | 28 |
| 28 ClientSession::ClientSession( | 29 ClientSession::ClientSession( |
| 29 EventHandler* event_handler, | 30 EventHandler* event_handler, |
| 30 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, | 31 scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, |
| 31 scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner, | 32 scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner, |
| 32 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner, | 33 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner, |
| 33 scoped_ptr<protocol::ConnectionToClient> connection, | 34 scoped_ptr<protocol::ConnectionToClient> connection, |
| 34 scoped_ptr<DesktopEnvironment> desktop_environment, | 35 DesktopEnvironmentFactory* desktop_environment_factory, |
| 35 const base::TimeDelta& max_duration) | 36 const base::TimeDelta& max_duration) |
| 36 : event_handler_(event_handler), | 37 : event_handler_(event_handler), |
| 37 connection_(connection.Pass()), | 38 connection_(connection.Pass()), |
| 38 desktop_environment_(desktop_environment.Pass()), | 39 desktop_environment_(desktop_environment_factory->Create( |
| 40 ALLOW_THIS_IN_INITIALIZER_LIST(this))), |
| 39 client_jid_(connection_->session()->jid()), | 41 client_jid_(connection_->session()->jid()), |
| 40 host_clipboard_stub_(desktop_environment_->event_executor()), | 42 host_clipboard_stub_(desktop_environment_->event_executor()), |
| 41 host_input_stub_(desktop_environment_->event_executor()), | 43 host_input_stub_(desktop_environment_->event_executor()), |
| 42 input_tracker_(host_input_stub_), | 44 input_tracker_(host_input_stub_), |
| 43 remote_input_filter_(&input_tracker_), | 45 remote_input_filter_(&input_tracker_), |
| 44 mouse_clamping_filter_(desktop_environment_->video_capturer(), | 46 mouse_clamping_filter_(desktop_environment_->video_capturer(), |
| 45 &remote_input_filter_), | 47 &remote_input_filter_), |
| 46 disable_input_filter_(&mouse_clamping_filter_), | 48 disable_input_filter_(&mouse_clamping_filter_), |
| 47 disable_clipboard_filter_(clipboard_echo_filter_.host_filter()), | 49 disable_clipboard_filter_(clipboard_echo_filter_.host_filter()), |
| 48 auth_input_filter_(&disable_input_filter_), | 50 auth_input_filter_(&disable_input_filter_), |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 298 NOTIMPLEMENTED(); | 300 NOTIMPLEMENTED(); |
| 299 return scoped_ptr<AudioEncoder>(NULL); | 301 return scoped_ptr<AudioEncoder>(NULL); |
| 300 } | 302 } |
| 301 | 303 |
| 302 // static | 304 // static |
| 303 void ClientSessionTraits::Destruct(const ClientSession* client) { | 305 void ClientSessionTraits::Destruct(const ClientSession* client) { |
| 304 client->network_task_runner_->DeleteSoon(FROM_HERE, client); | 306 client->network_task_runner_->DeleteSoon(FROM_HERE, client); |
| 305 } | 307 } |
| 306 | 308 |
| 307 } // namespace remoting | 309 } // namespace remoting |
| OLD | NEW |