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/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
10 #include "media/video/capture/screen/screen_capturer.h" | 10 #include "media/video/capture/screen/screen_capturer.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 | 39 |
40 return InputInjector::Create(input_task_runner(), ui_task_runner()); | 40 return InputInjector::Create(input_task_runner(), ui_task_runner()); |
41 } | 41 } |
42 | 42 |
43 scoped_ptr<ScreenControls> BasicDesktopEnvironment::CreateScreenControls() { | 43 scoped_ptr<ScreenControls> BasicDesktopEnvironment::CreateScreenControls() { |
44 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 44 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
45 | 45 |
46 return scoped_ptr<ScreenControls>(); | 46 return scoped_ptr<ScreenControls>(); |
47 } | 47 } |
48 | 48 |
| 49 std::string BasicDesktopEnvironment::GetCapabilities() const { |
| 50 return std::string(); |
| 51 } |
| 52 |
| 53 void BasicDesktopEnvironment::SetCapabilities(const std::string& capabilities) { |
| 54 } |
| 55 |
49 scoped_ptr<media::ScreenCapturer> | 56 scoped_ptr<media::ScreenCapturer> |
50 BasicDesktopEnvironment::CreateVideoCapturer() { | 57 BasicDesktopEnvironment::CreateVideoCapturer() { |
51 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 58 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
52 | 59 |
53 // The basic desktop environment does not use X DAMAGE, since it is | 60 // The basic desktop environment does not use X DAMAGE, since it is |
54 // broken on many systems - see http://crbug.com/73423. | 61 // broken on many systems - see http://crbug.com/73423. |
55 return media::ScreenCapturer::Create(); | 62 return media::ScreenCapturer::Create(); |
56 } | 63 } |
57 | 64 |
58 BasicDesktopEnvironment::BasicDesktopEnvironment( | 65 BasicDesktopEnvironment::BasicDesktopEnvironment( |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 &ui_strings_)); | 132 &ui_strings_)); |
126 } | 133 } |
127 | 134 |
128 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const { | 135 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const { |
129 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 136 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
130 | 137 |
131 return AudioCapturer::IsSupported(); | 138 return AudioCapturer::IsSupported(); |
132 } | 139 } |
133 | 140 |
134 } // namespace remoting | 141 } // namespace remoting |
OLD | NEW |