sk6_charactercomposer: Merged DispatchKeyEvent and its fabricated version.

ui/base/ime/input_method_base.cc

Index: ui/base/ime/input_method_base.cc
diff --git a/ui/base/ime/input_method_base.cc b/ui/base/ime/input_method_base.cc
index 73a1fa737f7738968bc5b88fb1afade22cb77bb0..e688fbb07afe49c4a3ebc9ca761752c96217925e 100644
--- a/ui/base/ime/input_method_base.cc
+++ b/ui/base/ime/input_method_base.cc
@@ -8,6 +8,7 @@
 #include "ui/base/ime/input_method_delegate.h"
 #include "ui/base/ime/input_method_observer.h"
 #include "ui/base/ime/text_input_client.h"
+#include "ui/events/event.h"
 
 namespace ui {
 
@@ -117,15 +118,16 @@ void InputMethodBase::OnInputMethodChanged() const {
 }
 
 bool InputMethodBase::DispatchKeyEventPostIME(
-    const base::NativeEvent& native_event) const {
-  return delegate_ ? delegate_->DispatchKeyEventPostIME(native_event) : false;
-}
-
-bool InputMethodBase::DispatchFabricatedKeyEventPostIME(EventType type,
-                                                        KeyboardCode key_code,
-                                                        int flags) const {
-  return delegate_ ? delegate_->DispatchFabricatedKeyEventPostIME
-      (type, key_code, flags) : false;
+    const ui::KeyEvent& event) const {
+  if (!delegate_)
+    return false;
+
+  if (event.HasNativeEvent())
+    return delegate_->DispatchKeyEventPostIME(event);
+  else
+    return delegate_->DispatchFabricatedKeyEventPostIME(event.type(),
+                                                        event.key_code(),
+                                                        event.flags());
 }
 
 void InputMethodBase::NotifyTextInputStateChanged(