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

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

Issue 799233004: Add touch events to the protocol, the stub layer, and to the client plugin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add more comments to event proto Created 5 years, 10 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 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/input_injector_chromeos.h" 5 #include "remoting/host/input_injector_chromeos.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/location.h" 11 #include "base/location.h"
12 #include "remoting/host/chromeos/point_transformer.h" 12 #include "remoting/host/chromeos/point_transformer.h"
13 #include "remoting/host/clipboard.h" 13 #include "remoting/host/clipboard.h"
14 #include "remoting/proto/internal.pb.h" 14 #include "remoting/proto/internal.pb.h"
15 #include "ui/events/keycodes/dom3/dom_code.h" 15 #include "ui/events/keycodes/dom3/dom_code.h"
16 #include "ui/events/keycodes/dom4/keycode_converter.h" 16 #include "ui/events/keycodes/dom4/keycode_converter.h"
17 #include "ui/ozone/public/input_controller.h" 17 #include "ui/ozone/public/input_controller.h"
18 #include "ui/ozone/public/ozone_platform.h" 18 #include "ui/ozone/public/ozone_platform.h"
19 #include "ui/ozone/public/system_input_injector.h" 19 #include "ui/ozone/public/system_input_injector.h"
20 20
21 namespace remoting { 21 namespace remoting {
22 22
23 using protocol::ClipboardEvent; 23 using protocol::ClipboardEvent;
24 using protocol::KeyEvent; 24 using protocol::KeyEvent;
25 using protocol::MouseEvent; 25 using protocol::MouseEvent;
26 using protocol::TextEvent; 26 using protocol::TextEvent;
27 using protocol::TouchEvent;
27 28
28 namespace { 29 namespace {
29 30
30 ui::EventFlags MouseButtonToUIFlags(MouseEvent::MouseButton button) { 31 ui::EventFlags MouseButtonToUIFlags(MouseEvent::MouseButton button) {
31 switch (button) { 32 switch (button) {
32 case MouseEvent::BUTTON_LEFT: 33 case MouseEvent::BUTTON_LEFT:
33 return ui::EF_LEFT_MOUSE_BUTTON; 34 return ui::EF_LEFT_MOUSE_BUTTON;
34 case MouseEvent::BUTTON_RIGHT: 35 case MouseEvent::BUTTON_RIGHT:
35 return ui::EF_RIGHT_MOUSE_BUTTON; 36 return ui::EF_RIGHT_MOUSE_BUTTON;
36 case MouseEvent::BUTTON_MIDDLE: 37 case MouseEvent::BUTTON_MIDDLE:
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 FROM_HERE, 193 FROM_HERE,
193 base::Bind(&Core::InjectTextEvent, base::Unretained(core_.get()), event)); 194 base::Bind(&Core::InjectTextEvent, base::Unretained(core_.get()), event));
194 } 195 }
195 196
196 void InputInjectorChromeos::InjectMouseEvent(const MouseEvent& event) { 197 void InputInjectorChromeos::InjectMouseEvent(const MouseEvent& event) {
197 input_task_runner_->PostTask( 198 input_task_runner_->PostTask(
198 FROM_HERE, base::Bind(&Core::InjectMouseEvent, 199 FROM_HERE, base::Bind(&Core::InjectMouseEvent,
199 base::Unretained(core_.get()), event)); 200 base::Unretained(core_.get()), event));
200 } 201 }
201 202
203 void InputInjectorChromeos::InjectTouchEvent(const TouchEvent& event) {
204 NOTIMPLEMENTED() << "Raw touch event injection not implemented for ChromeOS.";
205 }
206
202 void InputInjectorChromeos::Start( 207 void InputInjectorChromeos::Start(
203 scoped_ptr<protocol::ClipboardStub> client_clipboard) { 208 scoped_ptr<protocol::ClipboardStub> client_clipboard) {
204 input_task_runner_->PostTask( 209 input_task_runner_->PostTask(
205 FROM_HERE, base::Bind(&Core::Start, base::Unretained(core_.get()), 210 FROM_HERE, base::Bind(&Core::Start, base::Unretained(core_.get()),
206 base::Passed(&client_clipboard))); 211 base::Passed(&client_clipboard)));
207 } 212 }
208 213
209 // static 214 // static
210 scoped_ptr<InputInjector> InputInjector::Create( 215 scoped_ptr<InputInjector> InputInjector::Create(
211 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 216 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
212 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { 217 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
213 // The Ozone input injector must be called on the UI task runner of the 218 // The Ozone input injector must be called on the UI task runner of the
214 // browser process. 219 // browser process.
215 return make_scoped_ptr(new InputInjectorChromeos(ui_task_runner)); 220 return make_scoped_ptr(new InputInjectorChromeos(ui_task_runner));
216 } 221 }
217 222
218 } // namespace remoting 223 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698