| 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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), |
| 88 input_task_runner_(input_task_runner), | 88 input_task_runner_(input_task_runner), |
| 89 ui_task_runner_(ui_task_runner), | 89 ui_task_runner_(ui_task_runner), |
| 90 desktop_capture_options_(new webrtc::DesktopCaptureOptions( | 90 desktop_capture_options_(new webrtc::DesktopCaptureOptions( |
| 91 webrtc::DesktopCaptureOptions::CreateDefault())), | 91 webrtc::DesktopCaptureOptions::CreateDefault())), |
| 92 supports_touch_events_(supports_touch_events) { | 92 supports_touch_events_(supports_touch_events) { |
| 93 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 93 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| 94 desktop_capture_options_->set_detect_updated_region(true); |
| 94 #if defined(USE_X11) | 95 #if defined(USE_X11) |
| 95 IgnoreXServerGrabs(desktop_capture_options_->x_display()->display(), true); | 96 IgnoreXServerGrabs(desktop_capture_options_->x_display()->display(), true); |
| 96 #endif | 97 #endif |
| 97 } | 98 } |
| 98 | 99 |
| 99 BasicDesktopEnvironmentFactory::BasicDesktopEnvironmentFactory( | 100 BasicDesktopEnvironmentFactory::BasicDesktopEnvironmentFactory( |
| 100 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 101 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
| 101 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, | 102 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, |
| 102 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 103 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
| 103 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) | 104 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) |
| 104 : caller_task_runner_(caller_task_runner), | 105 : caller_task_runner_(caller_task_runner), |
| 105 video_capture_task_runner_(video_capture_task_runner), | 106 video_capture_task_runner_(video_capture_task_runner), |
| 106 input_task_runner_(input_task_runner), | 107 input_task_runner_(input_task_runner), |
| 107 ui_task_runner_(ui_task_runner), | 108 ui_task_runner_(ui_task_runner), |
| 108 supports_touch_events_(false) {} | 109 supports_touch_events_(false) {} |
| 109 | 110 |
| 110 BasicDesktopEnvironmentFactory::~BasicDesktopEnvironmentFactory() {} | 111 BasicDesktopEnvironmentFactory::~BasicDesktopEnvironmentFactory() {} |
| 111 | 112 |
| 112 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const { | 113 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const { |
| 113 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 114 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| 114 | 115 |
| 115 return AudioCapturer::IsSupported(); | 116 return AudioCapturer::IsSupported(); |
| 116 } | 117 } |
| 117 | 118 |
| 118 } // namespace remoting | 119 } // namespace remoting |
| OLD | NEW |