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

Unified Diff: remoting/host/input_injector_win.cc

Issue 1033913003: Touch Events capability negotiation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Pass supports_touch_events to classes that inherit BasicDesktopEnvironment Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: remoting/host/input_injector_win.cc
diff --git a/remoting/host/input_injector_win.cc b/remoting/host/input_injector_win.cc
index 37f628ac33bbf53044652910d5f49994dafdd750..e9c56271d65b9e71590e150c89cc450c316ef088 100644
--- a/remoting/host/input_injector_win.cc
+++ b/remoting/host/input_injector_win.cc
@@ -59,20 +59,19 @@ class InputInjectorWin : public InputInjector {
public:
InputInjectorWin(scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);
- virtual ~InputInjectorWin();
+ ~InputInjectorWin() override;
// ClipboardStub interface.
- virtual void InjectClipboardEvent(const ClipboardEvent& event) override;
+ void InjectClipboardEvent(const ClipboardEvent& event) override;
// InputStub interface.
- virtual void InjectKeyEvent(const KeyEvent& event) override;
- virtual void InjectTextEvent(const TextEvent& event) override;
- virtual void InjectMouseEvent(const MouseEvent& event) override;
- virtual void InjectTouchEvent(const TouchEvent& event) override;
+ void InjectKeyEvent(const KeyEvent& event) override;
+ void InjectTextEvent(const TextEvent& event) override;
+ void InjectMouseEvent(const MouseEvent& event) override;
+ void InjectTouchEvent(const TouchEvent& event) override;
// InputInjector interface.
- virtual void Start(
- scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
+ void Start(scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
private:
// The actual implementation resides in InputInjectorWin::Core class.
@@ -348,6 +347,7 @@ void InputInjectorWin::Core::HandleTouch(const TouchEvent& event) {
} // namespace
+// static
scoped_ptr<InputInjector> InputInjector::Create(
scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
@@ -355,4 +355,9 @@ scoped_ptr<InputInjector> InputInjector::Create(
new InputInjectorWin(main_task_runner, ui_task_runner));
}
+// static
+bool InputInjector::SupportsTouchEvents() {
+ return TouchInjectorWinDelegate::Create();
+}
+
} // namespace remoting

Powered by Google App Engine
This is Rietveld 408576698