Supports unicode composition(Ctrl+Shift+U) with C-S pressed.

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 927f698f4233ed4e1ec7fb3dc3bbb61fe486aed0..7f480f009b2b386f1ac1558572b7fc5083af9704 100644
--- a/ui/base/ime/input_method_ibus.h
+++ b/ui/base/ime/input_method_ibus.h
@@ -64,7 +64,9 @@ class UI_EXPORT InputMethodIBus
 
   // Process a key returned from the input method.
   virtual void ProcessKeyEventPostIME(const base::NativeEvent& native_key_event,
+                                      uint32 ibus_keyval,
                                       uint32 ibus_keycode,
+                                      uint32 ibus_state,
                                       bool handled);
 
   // Converts |native_event| to ibus representation.
@@ -117,16 +119,20 @@ class UI_EXPORT InputMethodIBus
 
   // Processes a key event that was not filtered by the input method.
   void ProcessUnfilteredKeyPressEvent(const base::NativeEvent& native_key_event,
-                                      uint32 ibus_keycode);
+                                      uint32 ibus_keyval,
+                                      uint32 ibus_keycode,
+                                      uint32 ibus_state);
   void ProcessUnfilteredFabricatedKeyPressEvent(EventType type,
                                                 KeyboardCode key_code,
-                                                int flags,
-                                                uint32 ibus_keyval);
+                                                int event_flags,
+                                                uint32 ibus_keyval,
+                                                uint32 ibus_keycode);
 
   // Processes an unfiltered key press event with character composer.
   // This method returns true if the key press is filtered by the composer.
   bool ProcessUnfilteredKeyPressEventWithCharacterComposer(uint32 ibus_keyval,
-                                                           uint32 state);
+                                                           uint32 ibus_keycode,
+                                                           int event_flags);
 
   // Sends input method result caused by the given key event to the focused text
   // input client.
@@ -162,7 +168,7 @@ class UI_EXPORT InputMethodIBus
   virtual void CommitText(const chromeos::IBusText& text) OVERRIDE;
   virtual void ForwardKeyEvent(uint32 keyval,
                                uint32 keycode,
-                               uint32 status) OVERRIDE;
+                               uint32 state) OVERRIDE;
   virtual void ShowPreeditText() OVERRIDE;
   virtual void HidePreeditText() OVERRIDE;
   virtual void UpdatePreeditText(const chromeos::IBusText& text,
@@ -172,8 +178,9 @@ class UI_EXPORT InputMethodIBus
 
   void CreateInputContextDone(const dbus::ObjectPath& object_path);
   void CreateInputContextFail();
-  void ProcessKeyEventDone(uint32 id, XEvent* xevent, uint32 keyval,
-                           bool is_handled);
+  void ProcessKeyEventDone(uint32 id, XEvent* xevent,
+                           uint32 ibus_keyval, uint32 ibus_keycode,
+                           uint32 ibus_state, bool is_handled);
 
   // All pending key events. Note: we do not own these object, we just save
   // pointers to these object so that we can abandon them when necessary.