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

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

Issue 1136503003: Consolidate ui/events/keycodes/dom[34]/ into .../dom/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 unified diff | Download patch
« no previous file with comments | « remoting/host/input_injector_win.cc ('k') | remoting/protocol/input_event_tracker.cc » ('j') | 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/input_injector.h" 5 #include "remoting/host/input_injector.h"
6 6
7 #include <X11/extensions/XInput.h> 7 #include <X11/extensions/XInput.h>
8 #include <X11/extensions/XTest.h> 8 #include <X11/extensions/XTest.h>
9 #include <X11/Xlib.h> 9 #include <X11/Xlib.h>
10 #include <X11/XKBlib.h> 10 #include <X11/XKBlib.h>
11 11
12 #include <set> 12 #include <set>
13 13
14 #include "base/basictypes.h" 14 #include "base/basictypes.h"
15 #include "base/bind.h" 15 #include "base/bind.h"
16 #include "base/compiler_specific.h" 16 #include "base/compiler_specific.h"
17 #include "base/location.h" 17 #include "base/location.h"
18 #include "base/single_thread_task_runner.h" 18 #include "base/single_thread_task_runner.h"
19 #include "base/strings/utf_string_conversion_utils.h" 19 #include "base/strings/utf_string_conversion_utils.h"
20 #include "remoting/base/logging.h" 20 #include "remoting/base/logging.h"
21 #if defined(OS_CHROMEOS) 21 #if defined(OS_CHROMEOS)
22 #include "remoting/host/chromeos/point_transformer.h" 22 #include "remoting/host/chromeos/point_transformer.h"
23 #endif 23 #endif
24 #include "remoting/host/clipboard.h" 24 #include "remoting/host/clipboard.h"
25 #include "remoting/host/linux/unicode_to_keysym.h" 25 #include "remoting/host/linux/unicode_to_keysym.h"
26 #include "remoting/proto/internal.pb.h" 26 #include "remoting/proto/internal.pb.h"
27 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" 27 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
28 #include "ui/events/keycodes/dom4/keycode_converter.h" 28 #include "ui/events/keycodes/dom/keycode_converter.h"
29 29
30 namespace remoting { 30 namespace remoting {
31 31
32 namespace { 32 namespace {
33 33
34 using protocol::ClipboardEvent; 34 using protocol::ClipboardEvent;
35 using protocol::KeyEvent; 35 using protocol::KeyEvent;
36 using protocol::TextEvent; 36 using protocol::TextEvent;
37 using protocol::MouseEvent; 37 using protocol::MouseEvent;
38 using protocol::TouchEvent; 38 using protocol::TouchEvent;
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, 633 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
634 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { 634 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
635 scoped_ptr<InputInjectorX11> injector( 635 scoped_ptr<InputInjectorX11> injector(
636 new InputInjectorX11(main_task_runner)); 636 new InputInjectorX11(main_task_runner));
637 if (!injector->Init()) 637 if (!injector->Init())
638 return nullptr; 638 return nullptr;
639 return injector.Pass(); 639 return injector.Pass();
640 } 640 }
641 641
642 } // namespace remoting 642 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/input_injector_win.cc ('k') | remoting/protocol/input_event_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698