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

Side by Side Diff: remoting/host/event_executor_win.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/host/event_executor_mac.cc ('k') | remoting/host/usb_keycode_map.h » ('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 <windows.h> 7 #include <windows.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "base/message_loop_proxy.h" 12 #include "base/message_loop_proxy.h"
13 #include "remoting/host/capturer.h" 13 #include "remoting/host/capturer.h"
14 #include "remoting/host/clipboard.h" 14 #include "remoting/host/clipboard.h"
15 #include "remoting/proto/event.pb.h" 15 #include "remoting/proto/event.pb.h"
16 #include "ui/base/keycodes/keyboard_codes.h"
17 16
18 namespace remoting { 17 namespace remoting {
19 18
20 namespace { 19 namespace {
21 20
22 using protocol::ClipboardEvent; 21 using protocol::ClipboardEvent;
23 using protocol::KeyEvent; 22 using protocol::KeyEvent;
24 using protocol::MouseEvent; 23 using protocol::MouseEvent;
25 24
26 // USB to XKB keycode map table. 25 // USB to XKB keycode map table.
27 #define USB_KEYMAP(usb, xkb, win, mac) {usb, win} 26 #define USB_KEYMAP(usb, xkb, win, mac) {usb, win}
28 #include "remoting/host/usb_keycode_map.h" 27 #include "ui/base/keycodes/usb_keycode_map.h"
29 #undef USB_KEYMAP 28 #undef USB_KEYMAP
30 29
31 // A class to generate events on Windows. 30 // A class to generate events on Windows.
32 class EventExecutorWin : public EventExecutor { 31 class EventExecutorWin : public EventExecutor {
33 public: 32 public:
34 EventExecutorWin(MessageLoop* message_loop, 33 EventExecutorWin(MessageLoop* message_loop,
35 base::MessageLoopProxy* ui_loop, 34 base::MessageLoopProxy* ui_loop,
36 Capturer* capturer); 35 Capturer* capturer);
37 virtual ~EventExecutorWin() {} 36 virtual ~EventExecutorWin() {}
38 37
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 } // namespace 287 } // namespace
289 288
290 scoped_ptr<EventExecutor> EventExecutor::Create(MessageLoop* message_loop, 289 scoped_ptr<EventExecutor> EventExecutor::Create(MessageLoop* message_loop,
291 base::MessageLoopProxy* ui_loop, 290 base::MessageLoopProxy* ui_loop,
292 Capturer* capturer) { 291 Capturer* capturer) {
293 return scoped_ptr<EventExecutor>( 292 return scoped_ptr<EventExecutor>(
294 new EventExecutorWin(message_loop, ui_loop, capturer)); 293 new EventExecutorWin(message_loop, ui_loop, capturer));
295 } 294 }
296 295
297 } // namespace remoting 296 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/event_executor_mac.cc ('k') | remoting/host/usb_keycode_map.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698