sk6_charactercomposer: Merged DispatchKeyEvent and its fabricated version.

chrome/browser/chromeos/input_method/input_method_engine_ibus.cc

Index: chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc b/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
index bd7d4f21c7c47d50cb2f9d545a1eb0953f173546..7697ebeb69f82e05ad093f5da1c6526410f12a8a 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
+++ b/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
@@ -32,14 +32,6 @@ const char* kErrorWrongContext = "Context is not active";
 const char* kCandidateNotFound = "Candidate not found";
 const char* kEngineBusPrefix = "org.freedesktop.IBus.";
 
-namespace {
-const uint32 kIBusAltKeyMask = 1 << 3;
-const uint32 kIBusCtrlKeyMask = 1 << 2;
-const uint32 kIBusShiftKeyMask = 1 << 0;
-const uint32 kIBusCapsLockMask = 1 << 1;
-const uint32 kIBusKeyReleaseMask = 1 << 30;
-}
-
 InputMethodEngineIBus::InputMethodEngineIBus()
     : focused_(false),
       active_(false),
@@ -467,22 +459,25 @@ void InputMethodEngineIBus::Reset() {
 }
 
 void InputMethodEngineIBus::ProcessKeyEvent(
-    uint32 keysym,
-    uint32 keycode,
-    uint32 state,
+    const std::string& keysym,
+    const std::string& keycode,
+    bool is_key_down,
+    bool is_alt_down,
+    bool is_ctrl_down,
+    bool is_shift_down,
+    bool is_caps_lock_down,
     const KeyEventDoneCallback& callback) {
-
   KeyEventDoneCallback *handler = new KeyEventDoneCallback();
   *handler = callback;
 
   KeyboardEvent event;
-  event.type = !(state & kIBusKeyReleaseMask) ? "keydown" : "keyup";
-  event.key = input_method::GetIBusKey(keysym);
-  event.code = input_method::GetIBusKeyCode(keycode);
-  event.alt_key = state & kIBusAltKeyMask;
-  event.ctrl_key = state & kIBusCtrlKeyMask;
-  event.shift_key = state & kIBusShiftKeyMask;
-  event.caps_lock = state & kIBusCapsLockMask;
+  event.type = is_key_down ? "keydown" : "keyup";
+  event.key = keysym;
+  event.code = keycode;
+  event.alt_key = is_alt_down;
+  event.ctrl_key = is_ctrl_down;
+  event.shift_key = is_shift_down;
+  event.caps_lock = is_caps_lock_down;
   observer_->OnKeyEvent(
       engine_id_,
       event,