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/me2me_desktop_environment.h" | 5 #include "remoting/host/me2me_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/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
45 std::string capabilities = BasicDesktopEnvironment::GetCapabilities(); | 45 std::string capabilities = BasicDesktopEnvironment::GetCapabilities(); |
46 if (!capabilities.empty()) | 46 if (!capabilities.empty()) |
47 capabilities.append(" "); | 47 capabilities.append(" "); |
48 capabilities.append(protocol::kRateLimitResizeRequests); | 48 capabilities.append(protocol::kRateLimitResizeRequests); |
49 | 49 |
50 return capabilities; | 50 return capabilities; |
51 } | 51 } |
52 | 52 |
53 Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( | 53 Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( |
54 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 54 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
55 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, | |
55 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 56 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
56 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, | 57 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, |
57 bool supports_touch_events) | 58 bool supports_touch_events) |
58 : BasicDesktopEnvironment(caller_task_runner, | 59 : BasicDesktopEnvironment(caller_task_runner, |
60 video_capture_task_runner, | |
59 input_task_runner, | 61 input_task_runner, |
60 ui_task_runner, | 62 ui_task_runner, |
61 supports_touch_events), | 63 supports_touch_events), |
62 gnubby_auth_enabled_(false) { | 64 gnubby_auth_enabled_(false) { |
63 DCHECK(caller_task_runner->BelongsToCurrentThread()); | 65 DCHECK(caller_task_runner->BelongsToCurrentThread()); |
66 | |
67 // X DAMAGE is not enabled by default, since it is broken on many systems - | |
68 // see http://crbug.com/73423. It's save to enable it here because it works | |
joedow
2016/02/05 21:39:26
s/save/safe
Sergey Ulanov
2016/02/05 21:51:20
Done.
| |
69 // properly under Xvfb. | |
64 desktop_capture_options()->set_use_update_notifications(true); | 70 desktop_capture_options()->set_use_update_notifications(true); |
65 } | 71 } |
66 | 72 |
67 scoped_ptr<GnubbyAuthHandler> Me2MeDesktopEnvironment::CreateGnubbyAuthHandler( | 73 scoped_ptr<GnubbyAuthHandler> Me2MeDesktopEnvironment::CreateGnubbyAuthHandler( |
68 protocol::ClientStub* client_stub) { | 74 protocol::ClientStub* client_stub) { |
69 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 75 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
70 | 76 |
71 if (gnubby_auth_enabled_) | 77 if (gnubby_auth_enabled_) |
72 return GnubbyAuthHandler::Create(client_stub); | 78 return GnubbyAuthHandler::Create(client_stub); |
73 | 79 |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
125 | 131 |
126 return true; | 132 return true; |
127 } | 133 } |
128 | 134 |
129 void Me2MeDesktopEnvironment::SetEnableGnubbyAuth(bool gnubby_auth_enabled) { | 135 void Me2MeDesktopEnvironment::SetEnableGnubbyAuth(bool gnubby_auth_enabled) { |
130 gnubby_auth_enabled_ = gnubby_auth_enabled; | 136 gnubby_auth_enabled_ = gnubby_auth_enabled; |
131 } | 137 } |
132 | 138 |
133 Me2MeDesktopEnvironmentFactory::Me2MeDesktopEnvironmentFactory( | 139 Me2MeDesktopEnvironmentFactory::Me2MeDesktopEnvironmentFactory( |
134 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 140 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
141 scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner, | |
135 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 142 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
136 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) | 143 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) |
137 : BasicDesktopEnvironmentFactory(caller_task_runner, | 144 : BasicDesktopEnvironmentFactory(caller_task_runner, |
145 video_capture_task_runner, | |
138 input_task_runner, | 146 input_task_runner, |
139 ui_task_runner), | 147 ui_task_runner), |
140 curtain_enabled_(false) { | 148 curtain_enabled_(false) {} |
141 } | |
142 | 149 |
143 Me2MeDesktopEnvironmentFactory::~Me2MeDesktopEnvironmentFactory() { | 150 Me2MeDesktopEnvironmentFactory::~Me2MeDesktopEnvironmentFactory() { |
144 } | 151 } |
145 | 152 |
146 scoped_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create( | 153 scoped_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create( |
147 base::WeakPtr<ClientSessionControl> client_session_control) { | 154 base::WeakPtr<ClientSessionControl> client_session_control) { |
148 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 155 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
149 | 156 |
150 scoped_ptr<Me2MeDesktopEnvironment> desktop_environment( | 157 scoped_ptr<Me2MeDesktopEnvironment> desktop_environment( |
151 new Me2MeDesktopEnvironment(caller_task_runner(), | 158 new Me2MeDesktopEnvironment( |
152 input_task_runner(), | 159 caller_task_runner(), video_capture_task_runner(), |
153 ui_task_runner(), | 160 input_task_runner(), ui_task_runner(), supports_touch_events())); |
154 supports_touch_events())); | |
155 if (!desktop_environment->InitializeSecurity(client_session_control, | 161 if (!desktop_environment->InitializeSecurity(client_session_control, |
156 curtain_enabled_)) { | 162 curtain_enabled_)) { |
157 return nullptr; | 163 return nullptr; |
158 } | 164 } |
159 desktop_environment->SetEnableGnubbyAuth(gnubby_auth_enabled_); | 165 desktop_environment->SetEnableGnubbyAuth(gnubby_auth_enabled_); |
160 | 166 |
161 return std::move(desktop_environment); | 167 return std::move(desktop_environment); |
162 } | 168 } |
163 | 169 |
164 void Me2MeDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) { | 170 void Me2MeDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) { |
165 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 171 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
166 | 172 |
167 curtain_enabled_ = enable; | 173 curtain_enabled_ = enable; |
168 } | 174 } |
169 | 175 |
170 void Me2MeDesktopEnvironmentFactory::SetEnableGnubbyAuth( | 176 void Me2MeDesktopEnvironmentFactory::SetEnableGnubbyAuth( |
171 bool gnubby_auth_enabled) { | 177 bool gnubby_auth_enabled) { |
172 gnubby_auth_enabled_ = gnubby_auth_enabled; | 178 gnubby_auth_enabled_ = gnubby_auth_enabled; |
173 } | 179 } |
174 | 180 |
175 } // namespace remoting | 181 } // namespace remoting |
OLD | NEW |