| 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/basic_desktop_environment.h" | 5 #include "remoting/host/basic_desktop_environment.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 | 44 |
| 45 std::unique_ptr<ScreenControls> | 45 std::unique_ptr<ScreenControls> |
| 46 BasicDesktopEnvironment::CreateScreenControls() { | 46 BasicDesktopEnvironment::CreateScreenControls() { |
| 47 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 47 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| 48 | 48 |
| 49 return nullptr; | 49 return nullptr; |
| 50 } | 50 } |
| 51 | 51 |
| 52 std::unique_ptr<webrtc::MouseCursorMonitor> | 52 std::unique_ptr<webrtc::MouseCursorMonitor> |
| 53 BasicDesktopEnvironment::CreateMouseCursorMonitor() { | 53 BasicDesktopEnvironment::CreateMouseCursorMonitor() { |
| 54 return base::WrapUnique(new MouseCursorMonitorProxy( | 54 return base::MakeUnique<MouseCursorMonitorProxy>(video_capture_task_runner_, |
| 55 video_capture_task_runner_, *desktop_capture_options_)); | 55 *desktop_capture_options_); |
| 56 } | 56 } |
| 57 | 57 |
| 58 std::string BasicDesktopEnvironment::GetCapabilities() const { | 58 std::string BasicDesktopEnvironment::GetCapabilities() const { |
| 59 if (supports_touch_events_) | 59 if (supports_touch_events_) |
| 60 return protocol::kTouchEventsCapability; | 60 return protocol::kTouchEventsCapability; |
| 61 | 61 |
| 62 return std::string(); | 62 return std::string(); |
| 63 } | 63 } |
| 64 | 64 |
| 65 void BasicDesktopEnvironment::SetCapabilities(const std::string& capabilities) { | 65 void BasicDesktopEnvironment::SetCapabilities(const std::string& capabilities) { |
| 66 } | 66 } |
| 67 | 67 |
| 68 uint32_t BasicDesktopEnvironment::GetDesktopSessionId() const { | 68 uint32_t BasicDesktopEnvironment::GetDesktopSessionId() const { |
| 69 return UINT32_MAX; | 69 return UINT32_MAX; |
| 70 } | 70 } |
| 71 | 71 |
| 72 std::unique_ptr<webrtc::DesktopCapturer> | 72 std::unique_ptr<webrtc::DesktopCapturer> |
| 73 BasicDesktopEnvironment::CreateVideoCapturer() { | 73 BasicDesktopEnvironment::CreateVideoCapturer() { |
| 74 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 74 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| 75 | 75 |
| 76 return base::WrapUnique(new DesktopCapturerProxy(video_capture_task_runner_, | 76 return base::MakeUnique<DesktopCapturerProxy>(video_capture_task_runner_, |
| 77 *desktop_capture_options_)); | 77 *desktop_capture_options_); |
| 78 } | 78 } |
| 79 | 79 |
| 80 BasicDesktopEnvironment::BasicDesktopEnvironment( | 80 BasicDesktopEnvironment::BasicDesktopEnvironment( |
| 81 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 81 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
| 82 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, | 82 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, |
| 83 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 83 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
| 84 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, | 84 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
| 85 bool supports_touch_events) | 85 bool supports_touch_events) |
| 86 : caller_task_runner_(caller_task_runner), | 86 : caller_task_runner_(caller_task_runner), |
| 87 video_capture_task_runner_(video_capture_task_runner), | 87 video_capture_task_runner_(video_capture_task_runner), |
| (...skipping 21 matching lines...) Expand all Loading... |
| 109 | 109 |
| 110 BasicDesktopEnvironmentFactory::~BasicDesktopEnvironmentFactory() {} | 110 BasicDesktopEnvironmentFactory::~BasicDesktopEnvironmentFactory() {} |
| 111 | 111 |
| 112 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const { | 112 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const { |
| 113 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 113 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| 114 | 114 |
| 115 return AudioCapturer::IsSupported(); | 115 return AudioCapturer::IsSupported(); |
| 116 } | 116 } |
| 117 | 117 |
| 118 } // namespace remoting | 118 } // namespace remoting |
| OLD | NEW |