Remote assistance on Chrome OS Part IX - Input injection on Ozone

ui/events/keycodes/dom4/keycode_converter.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/keycodes/dom4/keycode_converter.h"
 
 #include "ui/events/keycodes/dom3/dom_code.h"
 #include "ui/events/keycodes/dom3/dom_key.h"
 
 namespace ui {
@@ skipping 186 matching lines @@
     if (usb_keycode_map[i].usb_keycode == usb_keycode) {
       if (usb_keycode_map[i].code)
         return usb_keycode_map[i].code;
       break;
     }
   }
   return "";
 }
 
 // static
+DomCode KeycodeConverter::UsbKeycodeToDomCode(uint32_t usb_keycode) {
+  for (size_t i = 0; i < kKeycodeMapEntries; ++i) {
+    if (usb_keycode_map[i].usb_keycode == usb_keycode)
+      return static_cast<DomCode>(usb_keycode);

[Wez, 2014/12/09 01:36:44]

Return usb_keycode_map[i].id rather than the static cast here.

[kelvinp, 2014/12/09 20:24:18]

Unfortunately, the id field does not exist on Linux. See line 19 on the same
file
#elif defined(OS_LINUX)
#define USB_KEYMAP(usb, xkb, win, mac, code, id) {usb, xkb, code}

+  }
+  return DomCode::NONE;
+}
+
+// static
 uint32_t KeycodeConverter::CodeToUsbKeycode(const char* code) {
   if (!code || !*code)
     return InvalidUsbKeycode();
 
   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].usb_keycode;
     }
   }
   return InvalidUsbKeycode();
 }
 
 }  // namespace ui