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

Side by Side Diff: content/renderer/pepper/usb_key_code_conversion_win.cc

Issue 1124963003: Remove ui::KeycodeConverter::CodeToNativeKeycode(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@x444048-3a-codes
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 | « content/renderer/pepper/usb_key_code_conversion_mac.cc ('k') | ui/events/event_unittest.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 "content/renderer/pepper/usb_key_code_conversion.h" 5 #include "content/renderer/pepper/usb_key_code_conversion.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "third_party/WebKit/public/web/WebInputEvent.h" 8 #include "third_party/WebKit/public/web/WebInputEvent.h"
9 #include "ui/events/keycodes/dom/keycode_converter.h" 9 #include "ui/events/keycodes/dom/keycode_converter.h"
10 10
11 using blink::WebKeyboardEvent; 11 using blink::WebKeyboardEvent;
12 12
13 namespace content { 13 namespace content {
14 14
15 uint32_t UsbKeyCodeForKeyboardEvent(const WebKeyboardEvent& key_event) { 15 uint32_t UsbKeyCodeForKeyboardEvent(const WebKeyboardEvent& key_event) {
16 // Extract the scancode and extended bit from the native key event's lParam. 16 // Extract the scancode and extended bit from the native key event's lParam.
17 int scancode = (key_event.nativeKeyCode >> 16) & 0x000000FF; 17 int scancode = (key_event.nativeKeyCode >> 16) & 0x000000FF;
18 if ((key_event.nativeKeyCode & (1 << 24)) != 0) 18 if ((key_event.nativeKeyCode & (1 << 24)) != 0)
19 scancode |= 0xe000; 19 scancode |= 0xe000;
20 20
21 return ui::KeycodeConverter::NativeKeycodeToUsbKeycode(scancode); 21 return ui::KeycodeConverter::NativeKeycodeToUsbKeycode(scancode);
22 } 22 }
23 23
24 const char* CodeForKeyboardEvent(const WebKeyboardEvent& key_event) { 24 const char* CodeForKeyboardEvent(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 return ui::KeycodeConverter::NativeKeycodeToCode(scancode); 30 return ui::KeycodeConverter::DomCodeToCodeString(
31 ui::KeycodeConverter::NativeKeycodeToDomCode(scancode));
31 } 32 }
32 33
33 } // namespace content 34 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/usb_key_code_conversion_mac.cc ('k') | ui/events/event_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698