ime: Remove `code` parameter from SendKeyEvent.

SendKeyEvent has an extra code parameter that is used when there is
no keycode. However, we can just implement that logic upstream so that
there is always a keycode and we can remove the `code` parameter.

Bug: b/174612548
Change-Id: I98bb1be1c62fe141ed74f7243b8ac645f9a51963
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2566868Reviewed-by: Keith Lee <keithlee@chromium.org>
Commit-Queue: Darren Shen <shend@chromium.org>
Cr-Commit-Position: refs/heads/master@{#834440}

chrome/browser/chromeos/input_method/input_method_engine.cc

@@ -513,12 +513,9 @@ void InputMethodEngine::CommitTextToInputContext(int context_id,
   }
 }
 
-bool InputMethodEngine::SendKeyEvent(ui::KeyEvent* event,
-                                     const std::string& code,
+bool InputMethodEngine::SendKeyEvent(const ui::KeyEvent& event,
                                      std::string* error) {
-  DCHECK(event);
-  if (event->key_code() == ui::VKEY_UNKNOWN)
-    event->set_key_code(ui::DomKeycodeToKeyboardCode(code));
+  ui::KeyEvent event_copy = event;
 
   // Marks the simulated key event is from the Virtual Keyboard.
   ui::Event::Properties properties;
@@ -526,12 +523,12 @@ bool InputMethodEngine::SendKeyEvent(ui::KeyEvent* event,
       std::vector<uint8_t>(ui::kPropertyFromVKSize);
   properties[ui::kPropertyFromVK][ui::kPropertyFromVKIsMirroringIndex] =
       (uint8_t)is_mirroring_;
-  event->SetProperties(properties);
+  event_copy.SetProperties(properties);
 
   ui::IMEInputContextHandlerInterface* input_context =
       ui::IMEBridge::Get()->GetInputContextHandler();
   if (input_context) {
-    input_context->SendKeyEvent(event);
+    input_context->SendKeyEvent(&event_copy);
     return true;
   }
 

chrome/browser/chromeos/input_method/input_method_engine.h

@@ -205,9 +205,7 @@ class InputMethodEngine : public InputMethodEngineBase,
   void CommitTextToInputContext(int context_id,
                                 const std::string& text) override;
 
-  bool SendKeyEvent(ui::KeyEvent* event,
-                    const std::string& code,
-                    std::string* error) override;
+  bool SendKeyEvent(const ui::KeyEvent& event, std::string* error) override;
 
   // Enables overriding input view page to Virtual Keyboard window.
   void EnableInputView();

chrome/browser/chromeos/input_method/input_method_engine_base.cc

@@ -423,8 +423,7 @@ bool InputMethodEngineBase::SendKeyEvents(
   }
 
   for (const auto& event : events) {
-    ui::KeyEvent ui_event = ConvertKeyboardEventToUIKeyEvent(event);
-    if (!SendKeyEvent(&ui_event, event.code, error))
+    if (!SendKeyEvent(ConvertKeyboardEventToUIKeyEvent(event), error))
       return false;
   }
   return true;

chrome/browser/chromeos/input_method/input_method_engine_base.h

@@ -310,8 +310,7 @@ class InputMethodEngineBase : virtual public ui::IMEEngineHandlerInterface,
   void DeleteSurroundingTextToInputContext(int offset, size_t number_of_chars);
 
   // Sends the key event to the window tree host.
-  virtual bool SendKeyEvent(ui::KeyEvent* ui_event,
-                            const std::string& code,
+  virtual bool SendKeyEvent(const ui::KeyEvent& ui_event,
                             std::string* error) = 0;
 
   // Used to verify that a key event is valid before precessing it in the

chrome/browser/extensions/api/input_ime/input_ime_api.cc

@@ -11,6 +11,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "extensions/browser/extension_registry.h"
 #include "ui/base/ime/chromeos/ime_bridge.h"
+#include "ui/base/ime/chromeos/ime_keymap.h"
 
 namespace input_ime = extensions::api::input_ime;
 namespace KeyEventHandled = extensions::api::input_ime::KeyEventHandled;
@@ -419,7 +420,9 @@ ExtensionFunction::ResponseAction InputImeSendKeyEventsFunction::Run() {
     event.type = input_ime::ToString(key_event.type);
     event.key = key_event.key;
     event.code = key_event.code;
-    event.key_code = key_event.key_code.get() ? *(key_event.key_code) : 0;
+    event.key_code = key_event.key_code.get()
+                         ? *(key_event.key_code)
+                         : ui::DomKeycodeToKeyboardCode(key_event.code);
     event.alt_key = key_event.alt_key ? *(key_event.alt_key) : false;
     event.altgr_key = key_event.altgr_key ? *(key_event.altgr_key) : false;
     event.ctrl_key = key_event.ctrl_key ? *(key_event.ctrl_key) : false;