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

Side by Side Diff: remoting/host/win/session_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/win/session_desktop_environment.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/win/session_desktop_environment.h" 5 #include "remoting/host/win/session_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/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 17 matching lines...) Expand all
28 InputInjector::Create(input_task_runner(), ui_task_runner()), 28 InputInjector::Create(input_task_runner(), ui_task_runner()),
29 ui_task_runner(), inject_sas_, lock_workstation_); 29 ui_task_runner(), inject_sas_, lock_workstation_);
30 } 30 }
31 31
32 SessionDesktopEnvironment::SessionDesktopEnvironment( 32 SessionDesktopEnvironment::SessionDesktopEnvironment(
33 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 33 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
34 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, 34 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
35 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 35 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
36 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, 36 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
37 const base::Closure& inject_sas, 37 const base::Closure& inject_sas,
38 const base::Closure& lock_workstation) 38 const base::Closure& lock_workstation,
39 bool supports_touch_events)
39 : Me2MeDesktopEnvironment(caller_task_runner, 40 : Me2MeDesktopEnvironment(caller_task_runner,
40 video_capture_task_runner, 41 video_capture_task_runner,
41 input_task_runner, 42 input_task_runner,
42 ui_task_runner), 43 ui_task_runner,
44 supports_touch_events),
43 inject_sas_(inject_sas), 45 inject_sas_(inject_sas),
44 lock_workstation_(lock_workstation) {} 46 lock_workstation_(lock_workstation) {}
45 47
46 SessionDesktopEnvironmentFactory::SessionDesktopEnvironmentFactory( 48 SessionDesktopEnvironmentFactory::SessionDesktopEnvironmentFactory(
47 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 49 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
48 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, 50 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
49 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 51 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
50 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, 52 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
51 const base::Closure& inject_sas, 53 const base::Closure& inject_sas,
52 const base::Closure& lock_workstation) 54 const base::Closure& lock_workstation)
53 : Me2MeDesktopEnvironmentFactory(caller_task_runner, 55 : Me2MeDesktopEnvironmentFactory(caller_task_runner,
54 video_capture_task_runner, 56 video_capture_task_runner,
55 input_task_runner, 57 input_task_runner,
56 ui_task_runner), 58 ui_task_runner),
57 inject_sas_(inject_sas), 59 inject_sas_(inject_sas),
58 lock_workstation_(lock_workstation) { 60 lock_workstation_(lock_workstation) {
59 DCHECK(caller_task_runner->BelongsToCurrentThread()); 61 DCHECK(caller_task_runner->BelongsToCurrentThread());
60 } 62 }
61 63
62 SessionDesktopEnvironmentFactory::~SessionDesktopEnvironmentFactory() {} 64 SessionDesktopEnvironmentFactory::~SessionDesktopEnvironmentFactory() {}
63 65
64 std::unique_ptr<DesktopEnvironment> SessionDesktopEnvironmentFactory::Create( 66 std::unique_ptr<DesktopEnvironment> SessionDesktopEnvironmentFactory::Create(
65 base::WeakPtr<ClientSessionControl> client_session_control) { 67 base::WeakPtr<ClientSessionControl> client_session_control) {
66 DCHECK(caller_task_runner()->BelongsToCurrentThread()); 68 DCHECK(caller_task_runner()->BelongsToCurrentThread());
67 69
68 std::unique_ptr<SessionDesktopEnvironment> desktop_environment( 70 std::unique_ptr<SessionDesktopEnvironment> desktop_environment(
69 new SessionDesktopEnvironment(caller_task_runner(), 71 new SessionDesktopEnvironment(
70 video_capture_task_runner(), 72 caller_task_runner(), video_capture_task_runner(),
71 input_task_runner(), ui_task_runner(), 73 input_task_runner(), ui_task_runner(), inject_sas_, lock_workstation_,
72 inject_sas_, lock_workstation_)); 74 supports_touch_events()));
73 if (!desktop_environment->InitializeSecurity(client_session_control, 75 if (!desktop_environment->InitializeSecurity(client_session_control,
74 curtain_enabled())) { 76 curtain_enabled())) {
75 return nullptr; 77 return nullptr;
76 } 78 }
77 79
78 return std::move(desktop_environment); 80 return std::move(desktop_environment);
79 } 81 }
80 82
81 } // namespace remoting 83 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/win/session_desktop_environment.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698