3 files changed, 14 insertions, 32 deletions

diff --git a/ui/base/ime/chromeos/ibus_bridge.h b/ui/base/ime/chromeos/ibus_bridge.h
index 7a53253..e0e506b 100644
--- a/ui/base/ime/chromeos/ibus_bridge.h
+++ b/ui/base/ime/chromeos/ibus_bridge.h
@@ -17,6 +17,10 @@ namespace gfx {
 class Rect;
 }  // namespace gfx
 
+namespace ui {
+class KeyEvent;
+}  // namespace ui
+
 namespace chromeos {
 namespace ibus {
 // Following button indicator value is introduced from
@@ -91,15 +95,9 @@ class UI_EXPORT IBusEngineHandlerInterface {
   // 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.
+  // Called when the key event is received.
   // 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,
+  virtual void ProcessKeyEvent(const ui::KeyEvent& key_event,
                                const KeyEventDoneCallback& callback) = 0;
 
   // Called when the candidate in lookup table is clicked. The |index| is 0
diff --git a/ui/base/ime/chromeos/mock_ime_engine_handler.cc b/ui/base/ime/chromeos/mock_ime_engine_handler.cc
index d7e664f..239e583c0 100644
--- a/ui/base/ime/chromeos/mock_ime_engine_handler.cc
+++ b/ui/base/ime/chromeos/mock_ime_engine_handler.cc
@@ -15,10 +15,7 @@ MockIMEEngineHandler::MockIMEEngineHandler()
       last_text_input_context_(ui::TEXT_INPUT_TYPE_NONE,
                                ui::TEXT_INPUT_MODE_DEFAULT),
       last_set_surrounding_cursor_pos_(0),
-      last_set_surrounding_anchor_pos_(0),
-      last_processed_keysym_(0),
-      last_processed_keycode_(0),
-      last_processed_state_(0) {
+      last_set_surrounding_anchor_pos_(0) {
 }
 
 MockIMEEngineHandler::~MockIMEEngineHandler() {
@@ -48,14 +45,10 @@ void MockIMEEngineHandler::Reset() {
 }
 
 void MockIMEEngineHandler::ProcessKeyEvent(
-    uint32 keysym,
-    uint32 keycode,
-    uint32 state,
+    const ui::KeyEvent& key_event,
     const KeyEventDoneCallback& callback) {
   ++process_key_event_call_count_;
-  last_processed_keysym_ = keysym;
-  last_processed_keycode_ = keycode;
-  last_processed_state_ = state;
+  last_processed_key_event_.reset(key_event.Copy());
   last_passed_callback_ = callback;
 }
 
diff --git a/ui/base/ime/chromeos/mock_ime_engine_handler.h b/ui/base/ime/chromeos/mock_ime_engine_handler.h
index 56fc259..2e77dca 100644
--- a/ui/base/ime/chromeos/mock_ime_engine_handler.h
+++ b/ui/base/ime/chromeos/mock_ime_engine_handler.h
@@ -7,6 +7,7 @@
 
 #include "ui/base/ime/chromeos/ibus_bridge.h"
 #include "ui/base/ui_export.h"
+#include "ui/events/event.h"
 
 namespace chromeos {
 
@@ -21,7 +22,7 @@ class UI_EXPORT MockIMEEngineHandler : public IBusEngineHandlerInterface {
   virtual void Disable() OVERRIDE;
   virtual void PropertyActivate(const std::string& property_name) OVERRIDE;
   virtual void Reset() OVERRIDE;
-  virtual void ProcessKeyEvent(uint32 keysym, uint32 keycode, uint32 state,
+  virtual void ProcessKeyEvent(const ui::KeyEvent& key_event,
                                const KeyEventDoneCallback& callback) OVERRIDE;
   virtual void CandidateClicked(uint32 index, ibus::IBusMouseButton button,
                                 uint32 state) OVERRIDE;
@@ -58,16 +59,8 @@ class UI_EXPORT MockIMEEngineHandler : public IBusEngineHandlerInterface {
     return last_set_surrounding_anchor_pos_;
   }
 
-  uint32 last_processed_keysym() const {
-    return last_processed_keysym_;
-  }
-
-  uint32 last_processed_keycode() const {
-    return last_processed_keycode_;
-  }
-
-  uint32 last_processed_state() const {
-    return last_processed_state_;
+  const ui::KeyEvent* last_processed_key_event() const {
+    return last_processed_key_event_.get();
   }
 
   const KeyEventDoneCallback& last_passed_callback() const {
@@ -85,9 +78,7 @@ class UI_EXPORT 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_;
+  scoped_ptr<ui::KeyEvent> last_processed_key_event_;
   KeyEventDoneCallback last_passed_callback_;
 };