sk6_charactercomposer: Merged DispatchKeyEvent and its fabricated version.

chromeos/ime/mock_ime_engine_handler.h

Index: chromeos/ime/mock_ime_engine_handler.h
diff --git a/chromeos/ime/mock_ime_engine_handler.h b/chromeos/ime/mock_ime_engine_handler.h
index 2f9e3ee0a9f5b5cce57f08d3088f1342a58a1f8e..de4562f6b3e3c199c42c13428ae7090d6045a5a1 100644
--- a/chromeos/ime/mock_ime_engine_handler.h
+++ b/chromeos/ime/mock_ime_engine_handler.h
@@ -23,7 +23,13 @@ class MockIMEEngineHandler : public IBusEngineHandlerInterface {
   virtual void PropertyHide(const std::string& property_name) OVERRIDE;
   virtual void SetCapability(IBusCapability capability) OVERRIDE;
   virtual void Reset() OVERRIDE;
-  virtual void ProcessKeyEvent(uint32 keysym, uint32 keycode, uint32 state,
+  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) OVERRIDE;
   virtual void CandidateClicked(uint32 index, ibus::IBusMouseButton button,
                                 uint32 state) OVERRIDE;
@@ -56,16 +62,32 @@ class MockIMEEngineHandler : public IBusEngineHandlerInterface {
     return last_set_surrounding_anchor_pos_;
   }
 
-  uint32 last_processed_keysym() const {
+  std::string last_processed_keysym() const {
     return last_processed_keysym_;
   }
 
-  uint32 last_processed_keycode() const {
+  std::string last_processed_keycode() const {
     return last_processed_keycode_;
   }
 
-  uint32 last_processed_state() const {
-    return last_processed_state_;
+  bool last_processed_is_key_down() const {
+    return last_processed_is_key_down_;
+  }
+
+  bool last_processed_is_alt_down() const {
+    return last_processed_is_alt_down_;
+  }
+
+  bool last_processed_is_ctrl_down() const {
+    return last_processed_is_ctrl_down_;
+  }
+
+  bool last_processed_is_shift_down() const {
+    return last_processed_is_shift_down_;
+  }
+
+  bool last_processed_is_caps_lock_down() const {
+    return last_processed_is_caps_lock_down_;
   }
 
   const KeyEventDoneCallback& last_passed_callback() const {
@@ -82,9 +104,13 @@ class MockIMEEngineHandler : public IBusEngineHandlerInterface {
   std::string last_set_surrounding_text_;
   uint32 last_set_surrounding_cursor_pos_;
   uint32 last_set_surrounding_anchor_pos_;
-  uint32 last_processed_keysym_;
-  uint32 last_processed_keycode_;
-  uint32 last_processed_state_;
+  std::string last_processed_keysym_;
+  std::string last_processed_keycode_;
+  bool last_processed_is_key_down_;
+  bool last_processed_is_alt_down_;
+  bool last_processed_is_ctrl_down_;
+  bool last_processed_is_shift_down_;
+  bool last_processed_is_caps_lock_down_;
   KeyEventDoneCallback last_passed_callback_;
 };