sk6_charactercomposer: Merged DispatchKeyEvent and its fabricated version.

ui/base/ime/input_method_ibus.h

Index: ui/base/ime/input_method_ibus.h
diff --git a/ui/base/ime/input_method_ibus.h b/ui/base/ime/input_method_ibus.h
index b4aecde5b30a210abc951acce76ee089b473bc9a..7824b87bb3de1cdf11fc202bba4c9f0e3ed6b5ff 100644
--- a/ui/base/ime/input_method_ibus.h
+++ b/ui/base/ime/input_method_ibus.h
@@ -41,8 +41,7 @@ class UI_EXPORT InputMethodIBus
   virtual void OnBlur() OVERRIDE;
   virtual bool OnUntranslatedIMEMessage(const base::NativeEvent& event,
                                         NativeEventResult* result) OVERRIDE;
-  virtual bool DispatchKeyEvent(
-      const base::NativeEvent& native_key_event) OVERRIDE;
+  virtual bool DispatchKeyEvent(const ui::KeyEvent& event) OVERRIDE;
   virtual bool DispatchFabricatedKeyEvent(const ui::KeyEvent& event) OVERRIDE;
   virtual void OnTextInputTypeChanged(const TextInputClient* client) OVERRIDE;
   virtual void OnCaretBoundsChanged(const TextInputClient* client) OVERRIDE;
@@ -59,17 +58,9 @@ class UI_EXPORT InputMethodIBus
                               CompositionText* out_composition) const;
 
   // Process a key returned from the input method.
-  virtual void ProcessKeyEventPostIME(const base::NativeEvent& native_key_event,
-                                      uint32 ibus_state,
+  virtual void ProcessKeyEventPostIME(const ui::KeyEvent& event,
                                       bool handled);
 
-  // Converts |native_event| to ibus representation.
-  virtual void IBusKeyEventFromNativeKeyEvent(
-      const base::NativeEvent& native_event,
-      uint32* ibus_keyval,
-      uint32* ibus_keycode,
-      uint32* ibus_state);
-
   // Resets context and abandon all pending results and key events.
   void ResetContext();
 
@@ -91,19 +82,14 @@ class UI_EXPORT InputMethodIBus
 
   // Processes a key event that was already filtered by the input method.
   // A VKEY_PROCESSKEY may be dispatched to the focused View.
-  void ProcessFilteredKeyPressEvent(const base::NativeEvent& native_key_event);
+  void ProcessFilteredKeyPressEvent(const ui::KeyEvent& key_event);
 
   // Processes a key event that was not filtered by the input method.
-  void ProcessUnfilteredKeyPressEvent(const base::NativeEvent& native_key_event,
-                                      uint32 ibus_state);
-  void ProcessUnfilteredFabricatedKeyPressEvent(EventType type,
-                                                KeyboardCode key_code,
-                                                int event_flags);
+  void ProcessUnfilteredKeyPressEvent(const ui::KeyEvent& key_event);
 
   // Sends input method result caused by the given key event to the focused text
   // input client.
-  void ProcessInputMethodResult(const base::NativeEvent& native_key_event,
-                                bool filtered);
+  void ProcessInputMethodResult(const ui::KeyEvent& key_event, bool handled);
 
   // Checks if the pending input method result needs inserting into the focused
   // text input client as a single character.
@@ -118,9 +104,7 @@ class UI_EXPORT InputMethodIBus
 
   // Passes keyevent and executes character composition if necessary. Returns
   // true if character composer comsumes key event.
-  bool ExecuteCharacterComposer(uint32 ibus_keyval,
-                                uint32 ibus_keycode,
-                                uint32 ibus_state);
+  bool ExecuteCharacterComposer(const ui::KeyEvent& event);
 
   // chromeos::IBusInputContextHandlerInterface overrides:
   virtual void CommitText(const std::string& text) OVERRIDE;
@@ -134,9 +118,8 @@ class UI_EXPORT InputMethodIBus
                                  bool visible) OVERRIDE;
   virtual void DeleteSurroundingText(int32 offset, uint32 length) OVERRIDE;
 
-  void ProcessKeyEventDone(uint32 id, XEvent* xevent,
-                           uint32 ibus_keyval, uint32 ibus_keycode,
-                           uint32 ibus_state, bool is_handled);
+  // Callback function for IBusEngineHandlerInterface::ProcessKeyEvent.
+  void ProcessKeyEventDone(uint32 id, ui::KeyEvent* key_event, bool is_handled);
 
   // Processes a caret bounds changed event.
   void OnCaretBoundsChangedInternal(const TextInputClient* client);