Chromium Code Reviews| 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 "remoting/host/audio_capturer.h" | 10 #include "remoting/host/audio_capturer.h" |
| 11 #if defined(OS_CHROMEOS) | 11 #if defined(OS_CHROMEOS) |
| 12 #include "remoting/host/chromeos/aura_desktop_capturer.h" | 12 #include "remoting/host/chromeos/aura_desktop_capturer.h" |
| 13 #include "remoting/host/chromeos/mouse_cursor_monitor_aura.h" | 13 #include "remoting/host/chromeos/mouse_cursor_monitor_aura.h" |
| 14 #endif | 14 #endif |
| 15 #include "remoting/host/client_session_control.h" | 15 #include "remoting/host/client_session_control.h" |
| 16 #include "remoting/host/gnubby_auth_handler.h" | 16 #include "remoting/host/gnubby_auth_handler.h" |
| 17 #include "remoting/host/input_injector.h" | 17 #include "remoting/host/input_injector.h" |
| 18 #include "remoting/host/screen_controls.h" | 18 #include "remoting/host/screen_controls.h" |
| 19 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h" | 19 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h" |
| 20 #include "third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor.h" | 20 #include "third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor.h" |
| 21 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h" | 21 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h" |
| 22 | 22 |
| 23 namespace remoting { | 23 namespace remoting { |
| 24 | 24 |
| 25 namespace { | |
| 26 const char kRawTouchEventsCapability[] = "rawTouchEvents"; | |
|
Wez
2015/04/23 22:10:25
Why "raw" touch events?
I think it'd be reasonabl
Rintaro Kuroiwa
2015/04/24 01:55:02
Make sense :) will go with touchEvents.
I saw kRa
| |
| 27 } // namespace | |
| 28 | |
| 25 BasicDesktopEnvironment::~BasicDesktopEnvironment() { | 29 BasicDesktopEnvironment::~BasicDesktopEnvironment() { |
| 26 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 30 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| 27 } | 31 } |
| 28 | 32 |
| 29 scoped_ptr<AudioCapturer> BasicDesktopEnvironment::CreateAudioCapturer() { | 33 scoped_ptr<AudioCapturer> BasicDesktopEnvironment::CreateAudioCapturer() { |
| 30 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 34 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| 31 | 35 |
| 32 return AudioCapturer::Create(); | 36 return AudioCapturer::Create(); |
| 33 } | 37 } |
| 34 | 38 |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 48 BasicDesktopEnvironment::CreateMouseCursorMonitor() { | 52 BasicDesktopEnvironment::CreateMouseCursorMonitor() { |
| 49 #if defined(OS_CHROMEOS) | 53 #if defined(OS_CHROMEOS) |
| 50 return make_scoped_ptr(new MouseCursorMonitorAura()); | 54 return make_scoped_ptr(new MouseCursorMonitorAura()); |
| 51 #else | 55 #else |
| 52 return make_scoped_ptr(webrtc::MouseCursorMonitor::CreateForScreen( | 56 return make_scoped_ptr(webrtc::MouseCursorMonitor::CreateForScreen( |
| 53 *desktop_capture_options_, webrtc::kFullDesktopScreenId)); | 57 *desktop_capture_options_, webrtc::kFullDesktopScreenId)); |
| 54 #endif | 58 #endif |
| 55 } | 59 } |
| 56 | 60 |
| 57 std::string BasicDesktopEnvironment::GetCapabilities() const { | 61 std::string BasicDesktopEnvironment::GetCapabilities() const { |
| 62 if (supports_raw_touch_events_) | |
| 63 return kRawTouchEventsCapability; | |
| 64 | |
| 58 return std::string(); | 65 return std::string(); |
| 59 } | 66 } |
| 60 | 67 |
| 61 void BasicDesktopEnvironment::SetCapabilities(const std::string& capabilities) { | 68 void BasicDesktopEnvironment::SetCapabilities(const std::string& capabilities) { |
| 62 } | 69 } |
| 63 | 70 |
| 64 scoped_ptr<GnubbyAuthHandler> BasicDesktopEnvironment::CreateGnubbyAuthHandler( | 71 scoped_ptr<GnubbyAuthHandler> BasicDesktopEnvironment::CreateGnubbyAuthHandler( |
| 65 protocol::ClientStub* client_stub) { | 72 protocol::ClientStub* client_stub) { |
| 66 return nullptr; | 73 return nullptr; |
| 67 } | 74 } |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 82 | 89 |
| 83 BasicDesktopEnvironment::BasicDesktopEnvironment( | 90 BasicDesktopEnvironment::BasicDesktopEnvironment( |
| 84 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 91 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
| 85 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 92 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
| 86 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) | 93 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) |
| 87 : caller_task_runner_(caller_task_runner), | 94 : caller_task_runner_(caller_task_runner), |
| 88 input_task_runner_(input_task_runner), | 95 input_task_runner_(input_task_runner), |
| 89 ui_task_runner_(ui_task_runner), | 96 ui_task_runner_(ui_task_runner), |
| 90 desktop_capture_options_( | 97 desktop_capture_options_( |
| 91 new webrtc::DesktopCaptureOptions( | 98 new webrtc::DesktopCaptureOptions( |
| 92 webrtc::DesktopCaptureOptions::CreateDefault())) { | 99 webrtc::DesktopCaptureOptions::CreateDefault())), |
| 100 supports_raw_touch_events_(false) { | |
| 93 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 101 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| 94 } | 102 } |
| 95 | 103 |
| 96 BasicDesktopEnvironmentFactory::BasicDesktopEnvironmentFactory( | 104 BasicDesktopEnvironmentFactory::BasicDesktopEnvironmentFactory( |
| 97 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 105 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
| 98 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 106 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
| 99 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) | 107 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) |
| 100 : caller_task_runner_(caller_task_runner), | 108 : caller_task_runner_(caller_task_runner), |
| 101 input_task_runner_(input_task_runner), | 109 input_task_runner_(input_task_runner), |
| 102 ui_task_runner_(ui_task_runner) { | 110 ui_task_runner_(ui_task_runner), |
| 111 supports_raw_touch_events_(false) { | |
| 103 } | 112 } |
| 104 | 113 |
| 105 BasicDesktopEnvironmentFactory::~BasicDesktopEnvironmentFactory() { | 114 BasicDesktopEnvironmentFactory::~BasicDesktopEnvironmentFactory() { |
| 106 } | 115 } |
| 107 | 116 |
| 108 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const { | 117 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const { |
| 109 DCHECK(caller_task_runner_->BelongsToCurrentThread()); | 118 DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
| 110 | 119 |
| 111 return AudioCapturer::IsSupported(); | 120 return AudioCapturer::IsSupported(); |
| 112 } | 121 } |
| 113 | 122 |
| 114 } // namespace remoting | 123 } // namespace remoting |
| OLD | NEW |