sk6_charactercomposer: Merged DispatchKeyEvent and its fabricated version.

ui/base/ime/fake_input_method.cc

 // Copyright (c) 2012 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/fake_input_method.h"
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
 #include "ui/base/glib/glib_integers.h"
 #include "ui/base/ime/input_method_delegate.h"
@@ skipping 49 matching lines @@
     text_input_client_ = NULL;
     FOR_EACH_OBSERVER(InputMethodObserver, observers_,
                       OnTextInputStateChanged(client));
   }
 }
 
 TextInputClient* FakeInputMethod::GetTextInputClient() const {
   return text_input_client_;
 }
 
-bool FakeInputMethod::DispatchKeyEvent(const base::NativeEvent& native_event) {
+bool FakeInputMethod::DispatchKeyEvent(const ui::KeyEvent& event) {
+  if (!event.HasNativeEvent())
+    return DispatchFabricatedKeyEvent(event);
+
+  const base::NativeEvent& native_event = event.native_event();
   bool handled = false;
 #if defined(OS_WIN)
   if (native_event.message == WM_CHAR) {
     if (text_input_client_) {
       text_input_client_->InsertChar(ui::KeyboardCodeFromNative(native_event),
                                      ui::EventFlagsFromNative(native_event));
       handled = true;
     }
   } else {
     handled = delegate_->DispatchKeyEventPostIME(native_event);
   }
 #elif defined(USE_X11)
   DCHECK(native_event);
   if (native_event->type == KeyRelease) {
     // On key release, just dispatch it.
-    handled = delegate_->DispatchKeyEventPostIME(native_event);
+    handled = delegate_->DispatchKeyEventPostIME(event);
   } else {
     const uint32 state = EventFlagsFromXFlags(native_event->xkey.state);
     // Send a RawKeyDown event first,
-    handled = delegate_->DispatchKeyEventPostIME(native_event);
+    handled = delegate_->DispatchKeyEventPostIME(event);
     if (text_input_client_) {
       // then send a Char event via ui::TextInputClient.
       const KeyboardCode key_code = ui::KeyboardCodeFromNative(native_event);
       uint16 ch = 0;
       if (!(state & ui::EF_CONTROL_DOWN))
         ch = ui::GetCharacterFromXEvent(native_event);
       if (!ch)
         ch = ui::GetCharacterFromKeyCode(key_code, state);
       if (ch)
         text_input_client_->InsertChar(ch, state);
@@ skipping 83 matching lines @@
 
 void FakeInputMethod::AddObserver(InputMethodObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void FakeInputMethod::RemoveObserver(InputMethodObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 }  // namespace ui