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

Side by Side Diff: webkit/plugins/ppapi/usb_key_code_conversion_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
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 "webkit/plugins/ppapi/usb_key_code_conversion.h" 5 #include "webkit/plugins/ppapi/usb_key_code_conversion.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
9 9
10 using WebKit::WebKeyboardEvent; 10 using WebKit::WebKeyboardEvent;
11 11
12 namespace webkit { 12 namespace webkit {
13 namespace ppapi { 13 namespace ppapi {
14 14
15 namespace { 15 namespace {
16 16
17 #define USB_KEYMAP(usb, xkb, win, mac) {usb, win} 17 #define USB_KEYMAP(usb, xkb, win, mac) {usb, win}
18 #include "webkit/plugins/ppapi/usb_keycode_map.h" 18 #include "ui/base/keycodes/usb_keycode_map.h"
19 #undef USB_KEYMAP 19 #undef USB_KEYMAP
20 20
21 } // anonymous namespace 21 } // anonymous namespace
22 22
23 23
24 uint32_t UsbKeyCodeForKeyboardEvent(const WebKeyboardEvent& key_event) { 24 uint32_t UsbKeyCodeForKeyboardEvent(const WebKeyboardEvent& key_event) {
25 // Extract the scancode and extended bit from the native key event's lParam. 25 // Extract the scancode and extended bit from the native key event's lParam.
26 int scancode = (key_event.nativeKeyCode >> 16) & 0x000000FF; 26 int scancode = (key_event.nativeKeyCode >> 16) & 0x000000FF;
27 if ((key_event.nativeKeyCode & (1 << 24)) != 0) 27 if ((key_event.nativeKeyCode & (1 << 24)) != 0)
28 scancode |= 0xe000; 28 scancode |= 0xe000;
29 29
30 for (int i = 0; i < arraysize(usb_keycode_map); i++) { 30 for (int i = 0; i < arraysize(usb_keycode_map); i++) {
31 if (usb_keycode_map[i].native_keycode == scancode) 31 if (usb_keycode_map[i].native_keycode == scancode)
32 return usb_keycode_map[i].usb_keycode; 32 return usb_keycode_map[i].usb_keycode;
33 } 33 }
34 34
35 return 0; 35 return 0;
36 } 36 }
37 37
38 } // namespace ppapi 38 } // namespace ppapi
39 } // namespace webkit 39 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/ppapi/usb_key_code_conversion_mac.cc ('k') | webkit/plugins/ppapi/usb_keycode_map.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698