| Index: ui/events/keycodes/dom4/keycode_converter.cc
|
| diff --git a/ui/events/keycodes/dom4/keycode_converter.cc b/ui/events/keycodes/dom4/keycode_converter.cc
|
| index b594694bf65c31304d6c9fb967527cef98282ff9..4c5a9e095409993b05967215c183b0f6dd407b7b 100644
|
| --- a/ui/events/keycodes/dom4/keycode_converter.cc
|
| +++ b/ui/events/keycodes/dom4/keycode_converter.cc
|
| @@ -69,18 +69,6 @@ int KeycodeConverter::InvalidNativeKeycode() {
|
| }
|
|
|
| // static
|
| -const char* KeycodeConverter::NativeKeycodeToCode(int native_keycode) {
|
| - for (size_t i = 0; i < kKeycodeMapEntries; ++i) {
|
| - if (usb_keycode_map[i].native_keycode == native_keycode) {
|
| - if (usb_keycode_map[i].code != NULL)
|
| - return usb_keycode_map[i].code;
|
| - break;
|
| - }
|
| - }
|
| - return "";
|
| -}
|
| -
|
| -// static
|
| DomCode KeycodeConverter::NativeKeycodeToDomCode(int native_keycode) {
|
| for (size_t i = 0; i < kKeycodeMapEntries; ++i) {
|
| if (usb_keycode_map[i].native_keycode == native_keycode) {
|
| @@ -93,20 +81,6 @@ DomCode KeycodeConverter::NativeKeycodeToDomCode(int native_keycode) {
|
| }
|
|
|
| // static
|
| -int KeycodeConverter::CodeToNativeKeycode(const char* code) {
|
| - if (!code || !*code)
|
| - return InvalidNativeKeycode();
|
| -
|
| - for (size_t i = 0; i < kKeycodeMapEntries; ++i) {
|
| - if (usb_keycode_map[i].code &&
|
| - strcmp(usb_keycode_map[i].code, code) == 0) {
|
| - return usb_keycode_map[i].native_keycode;
|
| - }
|
| - }
|
| - return InvalidNativeKeycode();
|
| -}
|
| -
|
| -// static
|
| int KeycodeConverter::DomCodeToNativeKeycode(DomCode code) {
|
| return UsbKeycodeToNativeKeycode(static_cast<uint32_t>(code));
|
| }
|
| @@ -129,7 +103,14 @@ DomCode KeycodeConverter::CodeStringToDomCode(const char* code) {
|
|
|
| // static
|
| const char* KeycodeConverter::DomCodeToCodeString(DomCode dom_code) {
|
| - return UsbKeycodeToCode(static_cast<uint32_t>(dom_code));
|
| + for (size_t i = 0; i < kKeycodeMapEntries; ++i) {
|
| + if (usb_keycode_map[i].usb_keycode == static_cast<uint32_t>(dom_code)) {
|
| + if (usb_keycode_map[i].code)
|
| + return usb_keycode_map[i].code;
|
| + break;
|
| + }
|
| + }
|
| + return "";
|
| }
|
|
|
| // static
|
| @@ -190,24 +171,21 @@ uint32_t KeycodeConverter::NativeKeycodeToUsbKeycode(int native_keycode) {
|
| }
|
|
|
| // static
|
| -const char* KeycodeConverter::UsbKeycodeToCode(uint32_t usb_keycode) {
|
| +DomCode KeycodeConverter::UsbKeycodeToDomCode(uint32_t usb_keycode) {
|
| for (size_t i = 0; i < kKeycodeMapEntries; ++i) {
|
| - if (usb_keycode_map[i].usb_keycode == usb_keycode) {
|
| - if (usb_keycode_map[i].code)
|
| - return usb_keycode_map[i].code;
|
| - break;
|
| - }
|
| + if (usb_keycode_map[i].usb_keycode == usb_keycode)
|
| + return static_cast<DomCode>(usb_keycode);
|
| }
|
| - return "";
|
| + return DomCode::NONE;
|
| }
|
|
|
| // static
|
| -DomCode KeycodeConverter::UsbKeycodeToDomCode(uint32_t usb_keycode) {
|
| +uint32_t KeycodeConverter::DomCodeToUsbKeycode(DomCode dom_code) {
|
| for (size_t i = 0; i < kKeycodeMapEntries; ++i) {
|
| - if (usb_keycode_map[i].usb_keycode == usb_keycode)
|
| - return static_cast<DomCode>(usb_keycode);
|
| + if (usb_keycode_map[i].usb_keycode == static_cast<uint32_t>(dom_code))
|
| + return usb_keycode_map[i].usb_keycode;
|
| }
|
| - return DomCode::NONE;
|
| + return InvalidUsbKeycode();
|
| }
|
|
|
| // static
|
|
|