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/desktop_session_agent.h" | 5 #include "remoting/host/desktop_session_agent.h" |
6 | 6 |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/memory/shared_memory.h" | 9 #include "base/memory/shared_memory.h" |
10 #include "ipc/ipc_channel_proxy.h" | 10 #include "ipc/ipc_channel_proxy.h" |
11 #include "ipc/ipc_message.h" | 11 #include "ipc/ipc_message.h" |
12 #include "ipc/ipc_message_macros.h" | 12 #include "ipc/ipc_message_macros.h" |
13 #include "remoting/base/auto_thread_task_runner.h" | 13 #include "remoting/base/auto_thread_task_runner.h" |
14 #include "remoting/base/constants.h" | 14 #include "remoting/base/constants.h" |
15 #include "remoting/host/audio_capturer.h" | 15 #include "remoting/host/audio_capturer.h" |
16 #include "remoting/host/chromoting_messages.h" | 16 #include "remoting/host/chromoting_messages.h" |
17 #include "remoting/host/desktop_environment.h" | 17 #include "remoting/host/desktop_environment.h" |
18 #include "remoting/host/input_injector.h" | 18 #include "remoting/host/input_injector.h" |
19 #include "remoting/host/ipc_util.h" | 19 #include "remoting/host/ipc_util.h" |
20 #include "remoting/host/remote_input_filter.h" | 20 #include "remoting/host/remote_input_filter.h" |
21 #include "remoting/host/screen_controls.h" | 21 #include "remoting/host/screen_controls.h" |
22 #include "remoting/host/screen_resolution.h" | 22 #include "remoting/host/screen_resolution.h" |
23 #include "remoting/proto/audio.pb.h" | 23 #include "remoting/proto/audio.pb.h" |
24 #include "remoting/proto/control.pb.h" | 24 #include "remoting/proto/control.pb.h" |
25 #include "remoting/proto/event.pb.h" | 25 #include "remoting/proto/event.pb.h" |
26 #include "remoting/protocol/clipboard_stub.h" | 26 #include "remoting/protocol/clipboard_stub.h" |
27 #include "remoting/protocol/input_event_tracker.h" | 27 #include "remoting/protocol/input_event_tracker.h" |
| 28 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" |
28 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" | 29 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" |
29 #include "third_party/webrtc/modules/desktop_capture/shared_memory.h" | 30 #include "third_party/webrtc/modules/desktop_capture/shared_memory.h" |
30 | 31 |
31 namespace remoting { | 32 namespace remoting { |
32 | 33 |
33 namespace { | 34 namespace { |
34 | 35 |
35 // Routes local clipboard events though the IPC channel to the network process. | 36 // Routes local clipboard events though the IPC channel to the network process. |
36 class DesktopSesssionClipboardStub : public protocol::ClipboardStub { | 37 class DesktopSesssionClipboardStub : public protocol::ClipboardStub { |
37 public: | 38 public: |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 } | 219 } |
219 | 220 |
220 const std::string& DesktopSessionAgent::client_jid() const { | 221 const std::string& DesktopSessionAgent::client_jid() const { |
221 return client_jid_; | 222 return client_jid_; |
222 } | 223 } |
223 | 224 |
224 void DesktopSessionAgent::DisconnectSession() { | 225 void DesktopSessionAgent::DisconnectSession() { |
225 SendToNetwork(new ChromotingDesktopNetworkMsg_DisconnectSession()); | 226 SendToNetwork(new ChromotingDesktopNetworkMsg_DisconnectSession()); |
226 } | 227 } |
227 | 228 |
228 void DesktopSessionAgent::OnLocalMouseMoved(const SkIPoint& new_pos) { | 229 void DesktopSessionAgent::OnLocalMouseMoved( |
| 230 const webrtc::DesktopVector& new_pos) { |
229 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 231 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
230 | 232 |
231 remote_input_filter_->LocalMouseMoved(new_pos); | 233 remote_input_filter_->LocalMouseMoved(new_pos); |
232 } | 234 } |
233 | 235 |
234 void DesktopSessionAgent::SetDisableInputs(bool disable_inputs) { | 236 void DesktopSessionAgent::SetDisableInputs(bool disable_inputs) { |
235 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 237 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
236 | 238 |
237 // Do not expect this method to be called because it is only used by It2Me. | 239 // Do not expect this method to be called because it is only used by It2Me. |
238 NOTREACHED(); | 240 NOTREACHED(); |
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
546 base::ClosePlatformFile(desktop_pipe_.fd); | 548 base::ClosePlatformFile(desktop_pipe_.fd); |
547 #else // !defined(OS_POSIX) | 549 #else // !defined(OS_POSIX) |
548 #error Unsupported platform. | 550 #error Unsupported platform. |
549 #endif // !defined(OS_POSIX) | 551 #endif // !defined(OS_POSIX) |
550 | 552 |
551 desktop_pipe_ = IPC::InvalidPlatformFileForTransit(); | 553 desktop_pipe_ = IPC::InvalidPlatformFileForTransit(); |
552 } | 554 } |
553 } | 555 } |
554 | 556 |
555 } // namespace remoting | 557 } // namespace remoting |
OLD | NEW |