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 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 | 42 |
43 } // namespace | 43 } // namespace |
44 | 44 |
45 ClientSession::ClientSession( | 45 ClientSession::ClientSession( |
46 EventHandler* event_handler, | 46 EventHandler* event_handler, |
47 std::unique_ptr<protocol::ConnectionToClient> connection, | 47 std::unique_ptr<protocol::ConnectionToClient> connection, |
48 DesktopEnvironmentFactory* desktop_environment_factory, | 48 DesktopEnvironmentFactory* desktop_environment_factory, |
49 const DesktopEnvironmentOptions& desktop_environment_options, | 49 const DesktopEnvironmentOptions& desktop_environment_options, |
50 const base::TimeDelta& max_duration, | 50 const base::TimeDelta& max_duration, |
51 scoped_refptr<protocol::PairingRegistry> pairing_registry, | 51 scoped_refptr<protocol::PairingRegistry> pairing_registry, |
52 const std::vector<HostExtension*>& extensions) | 52 const std::vector<std::unique_ptr<HostExtension>>& extensions) |
53 : event_handler_(event_handler), | 53 : event_handler_(event_handler), |
54 connection_(std::move(connection)), | 54 connection_(std::move(connection)), |
55 client_jid_(connection_->session()->jid()), | 55 client_jid_(connection_->session()->jid()), |
56 desktop_environment_factory_(desktop_environment_factory), | 56 desktop_environment_factory_(desktop_environment_factory), |
57 desktop_environment_options_(desktop_environment_options), | 57 desktop_environment_options_(desktop_environment_options), |
58 input_tracker_(&host_input_filter_), | 58 input_tracker_(&host_input_filter_), |
59 remote_input_filter_(&input_tracker_), | 59 remote_input_filter_(&input_tracker_), |
60 mouse_clamping_filter_(&remote_input_filter_), | 60 mouse_clamping_filter_(&remote_input_filter_), |
61 disable_input_filter_(&mouse_clamping_filter_), | 61 disable_input_filter_(&mouse_clamping_filter_), |
62 disable_clipboard_filter_(clipboard_echo_filter_.host_filter()), | 62 disable_clipboard_filter_(clipboard_echo_filter_.host_filter()), |
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
462 connection_->client_stub()->SetVideoLayout(layout); | 462 connection_->client_stub()->SetVideoLayout(layout); |
463 } else { | 463 } else { |
464 pending_video_layout_message_.reset(new protocol::VideoLayout(layout)); | 464 pending_video_layout_message_.reset(new protocol::VideoLayout(layout)); |
465 } | 465 } |
466 break; | 466 break; |
467 } | 467 } |
468 } | 468 } |
469 } | 469 } |
470 | 470 |
471 } // namespace remoting | 471 } // namespace remoting |
OLD | NEW |