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

Side by Side Diff: remoting/client/plugin/chromoting_instance.cc

Issue 1033913003: Touch Events capability negotiation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months 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
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/client/plugin/chromoting_instance.h" 5 #include "remoting/client/plugin/chromoting_instance.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #if defined(OS_NACL) 10 #if defined(OS_NACL)
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 172
173 } // namespace 173 } // namespace
174 174
175 // String sent in the "hello" message to the webapp to describe features. 175 // String sent in the "hello" message to the webapp to describe features.
176 const char ChromotingInstance::kApiFeatures[] = 176 const char ChromotingInstance::kApiFeatures[] =
177 "highQualityScaling injectKeyEvent sendClipboardItem remapKey trapKey " 177 "highQualityScaling injectKeyEvent sendClipboardItem remapKey trapKey "
178 "notifyClientResolution pauseVideo pauseAudio asyncPin thirdPartyAuth " 178 "notifyClientResolution pauseVideo pauseAudio asyncPin thirdPartyAuth "
179 "pinlessAuth extensionMessage allowMouseLock videoControl"; 179 "pinlessAuth extensionMessage allowMouseLock videoControl";
180 180
181 const char ChromotingInstance::kRequestedCapabilities[] = ""; 181 const char ChromotingInstance::kRequestedCapabilities[] = "";
182 const char ChromotingInstance::kSupportedCapabilities[] = "desktopShape"; 182 const char ChromotingInstance::kSupportedCapabilities[] =
183 "desktopShape multiTouch";
Wez 2015/03/30 17:10:07 Do you mean to add multiTouch capability here? You
Rintaro Kuroiwa 2015/04/08 03:27:42 I'm not very good at javascript :( I found out tha
Wez 2015/04/09 22:58:59 My point is more that there are two sets of capabi
Rintaro Kuroiwa 2015/04/20 18:20:03 Oh I see. Yes I meant to do #1.
183 184
184 ChromotingInstance::ChromotingInstance(PP_Instance pp_instance) 185 ChromotingInstance::ChromotingInstance(PP_Instance pp_instance)
185 : pp::Instance(pp_instance), 186 : pp::Instance(pp_instance),
186 initialized_(false), 187 initialized_(false),
187 plugin_task_runner_(new PluginThreadTaskRunner(&plugin_thread_delegate_)), 188 plugin_task_runner_(new PluginThreadTaskRunner(&plugin_thread_delegate_)),
188 context_(plugin_task_runner_.get()), 189 context_(plugin_task_runner_.get()),
189 input_tracker_(&mouse_input_filter_), 190 input_tracker_(&mouse_input_filter_),
190 touch_input_scaler_(&input_tracker_), 191 touch_input_scaler_(&input_tracker_),
191 key_mapper_(&touch_input_scaler_), 192 key_mapper_(&touch_input_scaler_),
192 input_handler_(&input_tracker_), 193 input_handler_(&input_tracker_),
(...skipping 995 matching lines...) Expand 10 before | Expand all | Expand 10 after
1188 1189
1189 #if !defined(OS_NACL) 1190 #if !defined(OS_NACL)
1190 // Log messages are forwarded to the webapp only in PNaCl version of the 1191 // Log messages are forwarded to the webapp only in PNaCl version of the
1191 // plugin, so ProcessLogToUI() needs to be called explicitly in the non-PNaCl 1192 // plugin, so ProcessLogToUI() needs to be called explicitly in the non-PNaCl
1192 // version. 1193 // version.
1193 ProcessLogToUI(message); 1194 ProcessLogToUI(message);
1194 #endif // !defined(OS_NACL) 1195 #endif // !defined(OS_NACL)
1195 } 1196 }
1196 1197
1197 } // namespace remoting 1198 } // namespace remoting
OLDNEW
« no previous file with comments | « no previous file | remoting/host/basic_desktop_environment.h » ('j') | remoting/host/ipc_desktop_environment_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698