sk6_charactercomposer: Merged DispatchKeyEvent and its fabricated version.

ui/base/ime/input_method_linux_x11.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/base/ime/input_method_linux_x11.h"
 
 #include "ui/base/ime/linux/linux_input_method_context_factory.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
@@ skipping 27 matching lines @@
         TEXT_INPUT_TYPE_TEXT);
   }
 }
 
 bool InputMethodLinuxX11::OnUntranslatedIMEMessage(
     const base::NativeEvent& event,
     NativeEventResult* result) {
   return false;
 }
 
-bool InputMethodLinuxX11::DispatchKeyEvent(
-    const base::NativeEvent& native_key_event) {
+bool InputMethodLinuxX11::DispatchKeyEvent(const ui::KeyEvent& event) {
+  if (!event.HasNativeEvent())
+    return DispatchFabricatedKeyEvent(event);
+
+  const base::NativeEvent& native_key_event = event.native_event();
   EventType event_type = EventTypeFromNative(native_key_event);
   DCHECK(event_type == ET_KEY_PRESSED || event_type == ET_KEY_RELEASED);
   DCHECK(system_toplevel_window_focused());
 
   // If no text input client, do nothing.
   if (!GetTextInputClient())
     return DispatchKeyEventPostIME(native_key_event);
 
   // Let an IME handle the key event first.
   if (input_method_context_->DispatchKeyEvent(native_key_event)) {
@@ skipping 117 matching lines @@
     TextInputClient* focused_before,
     TextInputClient* focused) {
   input_method_context_->Reset();
   input_method_context_->OnTextInputTypeChanged(
       focused ? focused->GetTextInputType() : TEXT_INPUT_TYPE_NONE);
 
   InputMethodBase::OnDidChangeFocusedClient(focused_before, focused);
 }
 
 }  // namespace ui