| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/single_window_desktop_environment.h" | 5 #include "remoting/host/single_window_desktop_environment.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 std::unique_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override; | 26 std::unique_ptr<webrtc::DesktopCapturer> CreateVideoCapturer() override; |
| 27 std::unique_ptr<InputInjector> CreateInputInjector() override; | 27 std::unique_ptr<InputInjector> CreateInputInjector() override; |
| 28 | 28 |
| 29 protected: | 29 protected: |
| 30 friend class SingleWindowDesktopEnvironmentFactory; | 30 friend class SingleWindowDesktopEnvironmentFactory; |
| 31 SingleWindowDesktopEnvironment( | 31 SingleWindowDesktopEnvironment( |
| 32 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 32 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
| 33 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, | 33 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, |
| 34 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 34 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
| 35 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, | 35 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
| 36 webrtc::WindowId window_id, | 36 webrtc::WindowId window_id); |
| 37 bool supports_touch_events); | |
| 38 | 37 |
| 39 private: | 38 private: |
| 40 webrtc::WindowId window_id_; | 39 webrtc::WindowId window_id_; |
| 41 | 40 |
| 42 DISALLOW_COPY_AND_ASSIGN(SingleWindowDesktopEnvironment); | 41 DISALLOW_COPY_AND_ASSIGN(SingleWindowDesktopEnvironment); |
| 43 }; | 42 }; |
| 44 | 43 |
| 45 SingleWindowDesktopEnvironment::~SingleWindowDesktopEnvironment() {} | 44 SingleWindowDesktopEnvironment::~SingleWindowDesktopEnvironment() {} |
| 46 | 45 |
| 47 std::unique_ptr<webrtc::DesktopCapturer> | 46 std::unique_ptr<webrtc::DesktopCapturer> |
| (...skipping 19 matching lines...) Expand all Loading... |
| 67 InputInjector::Create(input_task_runner(), ui_task_runner())); | 66 InputInjector::Create(input_task_runner(), ui_task_runner())); |
| 68 return SingleWindowInputInjector::CreateForWindow( | 67 return SingleWindowInputInjector::CreateForWindow( |
| 69 window_id_, std::move(input_injector)); | 68 window_id_, std::move(input_injector)); |
| 70 } | 69 } |
| 71 | 70 |
| 72 SingleWindowDesktopEnvironment::SingleWindowDesktopEnvironment( | 71 SingleWindowDesktopEnvironment::SingleWindowDesktopEnvironment( |
| 73 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 72 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
| 74 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, | 73 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, |
| 75 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 74 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
| 76 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, | 75 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
| 77 webrtc::WindowId window_id, | 76 webrtc::WindowId window_id) |
| 78 bool supports_touch_events) | |
| 79 : BasicDesktopEnvironment(caller_task_runner, | 77 : BasicDesktopEnvironment(caller_task_runner, |
| 80 video_capture_task_runner, | 78 video_capture_task_runner, |
| 81 input_task_runner, | 79 input_task_runner, |
| 82 ui_task_runner, | 80 ui_task_runner), |
| 83 supports_touch_events), | |
| 84 window_id_(window_id) {} | 81 window_id_(window_id) {} |
| 85 | 82 |
| 86 SingleWindowDesktopEnvironmentFactory::SingleWindowDesktopEnvironmentFactory( | 83 SingleWindowDesktopEnvironmentFactory::SingleWindowDesktopEnvironmentFactory( |
| 87 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 84 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
| 88 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, | 85 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, |
| 89 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 86 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
| 90 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, | 87 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
| 91 webrtc::WindowId window_id) | 88 webrtc::WindowId window_id) |
| 92 : BasicDesktopEnvironmentFactory(caller_task_runner, | 89 : BasicDesktopEnvironmentFactory(caller_task_runner, |
| 93 video_capture_task_runner, | 90 video_capture_task_runner, |
| 94 input_task_runner, | 91 input_task_runner, |
| 95 ui_task_runner), | 92 ui_task_runner), |
| 96 window_id_(window_id) {} | 93 window_id_(window_id) {} |
| 97 | 94 |
| 98 SingleWindowDesktopEnvironmentFactory:: | 95 SingleWindowDesktopEnvironmentFactory:: |
| 99 ~SingleWindowDesktopEnvironmentFactory() { | 96 ~SingleWindowDesktopEnvironmentFactory() { |
| 100 } | 97 } |
| 101 | 98 |
| 102 std::unique_ptr<DesktopEnvironment> | 99 std::unique_ptr<DesktopEnvironment> |
| 103 SingleWindowDesktopEnvironmentFactory::Create( | 100 SingleWindowDesktopEnvironmentFactory::Create( |
| 104 base::WeakPtr<ClientSessionControl> client_session_control) { | 101 base::WeakPtr<ClientSessionControl> client_session_control) { |
| 105 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 102 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
| 106 | 103 |
| 107 return base::WrapUnique(new SingleWindowDesktopEnvironment( | 104 return base::WrapUnique(new SingleWindowDesktopEnvironment( |
| 108 caller_task_runner(), video_capture_task_runner(), input_task_runner(), | 105 caller_task_runner(), video_capture_task_runner(), input_task_runner(), |
| 109 ui_task_runner(), window_id_, supports_touch_events())); | 106 ui_task_runner(), window_id_)); |
| 110 } | 107 } |
| 111 | 108 |
| 112 } // namespace remoting | 109 } // namespace remoting |
| OLD | NEW |