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

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

Issue 10544106: Move usb_keycode_map.h into ui/base/keycodes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add comment to OWNERS Created 8 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « remoting/DEPS ('k') | remoting/host/event_executor_mac.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/event_executor.h" 5 #include "remoting/host/event_executor.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include <X11/Xlib.h> 9 #include <X11/Xlib.h>
10 #include <X11/XF86keysym.h> 10 #include <X11/XF86keysym.h>
(...skipping 10 matching lines...) Expand all
21 namespace remoting { 21 namespace remoting {
22 22
23 namespace { 23 namespace {
24 24
25 using protocol::ClipboardEvent; 25 using protocol::ClipboardEvent;
26 using protocol::KeyEvent; 26 using protocol::KeyEvent;
27 using protocol::MouseEvent; 27 using protocol::MouseEvent;
28 28
29 // USB to XKB keycode map table. 29 // USB to XKB keycode map table.
30 #define USB_KEYMAP(usb, xkb, win, mac) {usb, xkb} 30 #define USB_KEYMAP(usb, xkb, win, mac) {usb, xkb}
31 #include "remoting/host/usb_keycode_map.h" 31 #include "ui/base/keycodes/usb_keycode_map.h"
32 #undef USB_KEYMAP 32 #undef USB_KEYMAP
33 33
34 // A class to generate events on Linux. 34 // A class to generate events on Linux.
35 class EventExecutorLinux : public EventExecutor { 35 class EventExecutorLinux : public EventExecutor {
36 public: 36 public:
37 EventExecutorLinux(MessageLoop* message_loop); 37 EventExecutorLinux(MessageLoop* message_loop);
38 virtual ~EventExecutorLinux(); 38 virtual ~EventExecutorLinux();
39 39
40 bool Init(); 40 bool Init();
41 41
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 base::MessageLoopProxy* ui_loop, 435 base::MessageLoopProxy* ui_loop,
436 Capturer* capturer) { 436 Capturer* capturer) {
437 scoped_ptr<EventExecutorLinux> executor( 437 scoped_ptr<EventExecutorLinux> executor(
438 new EventExecutorLinux(message_loop)); 438 new EventExecutorLinux(message_loop));
439 if (!executor->Init()) 439 if (!executor->Init())
440 return scoped_ptr<EventExecutor>(NULL); 440 return scoped_ptr<EventExecutor>(NULL);
441 return executor.PassAs<EventExecutor>(); 441 return executor.PassAs<EventExecutor>();
442 } 442 }
443 443
444 } // namespace remoting 444 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/DEPS ('k') | remoting/host/event_executor_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698