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

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

Issue 494813002: events: keycodes: Remove the stateless singleton instance of KeycodeConverter (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 3 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 "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/dom4/keycode_converter.h" 9 #include "ui/events/keycodes/dom4/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 ui::KeycodeConverter* key_converter = ui::KeycodeConverter::GetInstance(); 21 return ui::KeycodeConverter::NativeKeycodeToUsbKeycode(scancode);
22 return key_converter->NativeKeycodeToUsbKeycode(scancode);
23 } 22 }
24 23
25 const char* CodeForKeyboardEvent(const WebKeyboardEvent& key_event) { 24 const char* CodeForKeyboardEvent(const WebKeyboardEvent& key_event) {
26 // 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.
27 int scancode = (key_event.nativeKeyCode >> 16) & 0x000000FF; 26 int scancode = (key_event.nativeKeyCode >> 16) & 0x000000FF;
28 if ((key_event.nativeKeyCode & (1 << 24)) != 0) 27 if ((key_event.nativeKeyCode & (1 << 24)) != 0)
29 scancode |= 0xe000; 28 scancode |= 0xe000;
30 29
31 ui::KeycodeConverter* key_converter = ui::KeycodeConverter::GetInstance(); 30 return ui::KeycodeConverter::NativeKeycodeToCode(scancode);
32 return key_converter->NativeKeycodeToCode(scancode);
33 } 31 }
34 32
35 } // namespace content 33 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/usb_key_code_conversion_mac.cc ('k') | remoting/client/plugin/pepper_input_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698