sk6_charactercomposer: Merged DispatchKeyEvent and its fabricated version.

chromeos/ime/ibus_bridge.h

 // 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.
 // TODO(nona): Rename this file to ime_bridge.h
 
 #ifndef CHROMEOS_IME_IBUS_BRIDGE_H_
 #define CHROMEOS_IME_IBUS_BRIDGE_H_
 
 #include <string>
 #include "base/basictypes.h"
@@ skipping 68 matching lines @@
 
   // Called when a property is hidden.
   virtual void PropertyHide(const std::string& property_name) = 0;
 
   // Called when the Chrome input field set their capabilities.
   virtual void SetCapability(IBusCapability capability) = 0;
 
   // Called when the IME is reset.
   virtual void Reset() = 0;
 
-  // Called when the key event is received. The |keycode| is raw layout
-  // independent keycode. The |keysym| is result of XLookupString function
-  // which translate |keycode| to keyboard layout dependent symbol value.
-  // Actual implementation must call |callback| after key event handling.
-  // For example: key press event for 'd' key on us layout and dvorak layout.
+  // Called when the key event is received. The |keycode| is raw
+  // layout independent keycode string. The |keysym| is a keyboard
+  // layout dependent symbol string.  Actual implementation must call
+  // |callback| after key event handling.  For example: key press
+  // event for 'd' key on us layout and dvorak layout.
   //                  keyval keycode state
-  //      us layout :  0x64   0x20    0x00
-  //  dvorak layout :  0x65   0x20    0x00
-  virtual void ProcessKeyEvent(uint32 keysym, uint32 keycode, uint32 state,
+  //      us layout :  "d"   "KeyD"   0x00
+  //  dvorak layout :  "e"   "KeyD"   0x00
+  //
+  // TODO(komatsu): Use ui::KeyEvent after addressing the DEPS issue.
+  virtual void ProcessKeyEvent(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) = 0;
 
   // Called when the candidate in lookup table is clicked. The |index| is 0
   // based candidate index in lookup table. The |state| is same value as
   // GdkModifierType in
   // http://developer.gnome.org/gdk/stable/gdk-Windows.html#GdkModifierType
   virtual void CandidateClicked(uint32 index, ibus::IBusMouseButton button,
                                 uint32 state) = 0;
 
   // Called when a new surrounding text is set. The |text| is surrounding text
@@ skipping 128 matching lines @@
  protected:
   IBusBridge();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(IBusBridge);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_IME_IBUS_BRIDGE_H_