Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(276)

Side by Side Diff: remoting/host/single_window_desktop_environment.cc

Issue 2458513004: Revert of Remove supports_touch_events flag from BasicDesktopEnvironment (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « remoting/host/remoting_me2me_host.cc ('k') | remoting/host/win/session_desktop_environment.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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);
37 38
38 private: 39 private:
39 webrtc::WindowId window_id_; 40 webrtc::WindowId window_id_;
40 41
41 DISALLOW_COPY_AND_ASSIGN(SingleWindowDesktopEnvironment); 42 DISALLOW_COPY_AND_ASSIGN(SingleWindowDesktopEnvironment);
42 }; 43 };
43 44
44 SingleWindowDesktopEnvironment::~SingleWindowDesktopEnvironment() {} 45 SingleWindowDesktopEnvironment::~SingleWindowDesktopEnvironment() {}
45 46
46 std::unique_ptr<webrtc::DesktopCapturer> 47 std::unique_ptr<webrtc::DesktopCapturer>
(...skipping 19 matching lines...) Expand all
66 InputInjector::Create(input_task_runner(), ui_task_runner())); 67 InputInjector::Create(input_task_runner(), ui_task_runner()));
67 return SingleWindowInputInjector::CreateForWindow( 68 return SingleWindowInputInjector::CreateForWindow(
68 window_id_, std::move(input_injector)); 69 window_id_, std::move(input_injector));
69 } 70 }
70 71
71 SingleWindowDesktopEnvironment::SingleWindowDesktopEnvironment( 72 SingleWindowDesktopEnvironment::SingleWindowDesktopEnvironment(
72 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 73 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
73 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, 74 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
74 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 75 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
75 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, 76 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
76 webrtc::WindowId window_id) 77 webrtc::WindowId window_id,
78 bool supports_touch_events)
77 : BasicDesktopEnvironment(caller_task_runner, 79 : BasicDesktopEnvironment(caller_task_runner,
78 video_capture_task_runner, 80 video_capture_task_runner,
79 input_task_runner, 81 input_task_runner,
80 ui_task_runner), 82 ui_task_runner,
83 supports_touch_events),
81 window_id_(window_id) {} 84 window_id_(window_id) {}
82 85
83 SingleWindowDesktopEnvironmentFactory::SingleWindowDesktopEnvironmentFactory( 86 SingleWindowDesktopEnvironmentFactory::SingleWindowDesktopEnvironmentFactory(
84 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 87 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
85 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, 88 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
86 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 89 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
87 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, 90 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
88 webrtc::WindowId window_id) 91 webrtc::WindowId window_id)
89 : BasicDesktopEnvironmentFactory(caller_task_runner, 92 : BasicDesktopEnvironmentFactory(caller_task_runner,
90 video_capture_task_runner, 93 video_capture_task_runner,
91 input_task_runner, 94 input_task_runner,
92 ui_task_runner), 95 ui_task_runner),
93 window_id_(window_id) {} 96 window_id_(window_id) {}
94 97
95 SingleWindowDesktopEnvironmentFactory:: 98 SingleWindowDesktopEnvironmentFactory::
96 ~SingleWindowDesktopEnvironmentFactory() { 99 ~SingleWindowDesktopEnvironmentFactory() {
97 } 100 }
98 101
99 std::unique_ptr<DesktopEnvironment> 102 std::unique_ptr<DesktopEnvironment>
100 SingleWindowDesktopEnvironmentFactory::Create( 103 SingleWindowDesktopEnvironmentFactory::Create(
101 base::WeakPtr<ClientSessionControl> client_session_control) { 104 base::WeakPtr<ClientSessionControl> client_session_control) {
102 DCHECK(caller_task_runner()->BelongsToCurrentThread()); 105 DCHECK(caller_task_runner()->BelongsToCurrentThread());
103 106
104 return base::WrapUnique(new SingleWindowDesktopEnvironment( 107 return base::WrapUnique(new SingleWindowDesktopEnvironment(
105 caller_task_runner(), video_capture_task_runner(), input_task_runner(), 108 caller_task_runner(), video_capture_task_runner(), input_task_runner(),
106 ui_task_runner(), window_id_)); 109 ui_task_runner(), window_id_, supports_touch_events()));
107 } 110 }
108 111
109 } // namespace remoting 112 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/remoting_me2me_host.cc ('k') | remoting/host/win/session_desktop_environment.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698