Support IMM32 reconversion on Windows

views/ime/input_method_ibus.h

Index: views/ime/input_method_ibus.h
diff --git a/views/ime/input_method_ibus.h b/views/ime/input_method_ibus.h
index 2402f6a0d7cd2cfb64c65b140f20da77347d6724..95e3977ad9c94dff7f15e7cada207c069e52e7ce 100644
--- a/views/ime/input_method_ibus.h
+++ b/views/ime/input_method_ibus.h
@@ -18,7 +18,9 @@
 #include "views/ime/input_method_base.h"
 #include "views/view.h"
 
-// Forward declarations, so that we don't need to include ibus.h in this file.
+// Forward declarations, so that we don't need to include ibus.h and glib.h in
+// this file.
+typedef struct _GAsyncResult GAsyncResult;

[James Su, 2011/10/25 19:15:03]

This forward declaration is not necessary to be in the header file. You should
only forward declare the types used in the header file.

[Peng, 2011/10/25 22:01:21]

Done.

 typedef struct _IBusBus IBusBus;
 typedef struct _IBusInputContext IBusInputContext;
 typedef struct _IBusText IBusText;
@@ -87,7 +89,7 @@ class InputMethodIBus : public InputMethodBase {
   void UpdateFakeContextFocusState();
 
   // Process a key returned from the input method.
-  void ProcessKeyEventPostIME(const KeyEvent& key, guint32 ibus_keycode,
+  void ProcessKeyEventPostIME(const KeyEvent& key, unsigned int ibus_keycode,

[James Su, 2011/10/25 19:15:03]

Change the corresponding .cc file as well? Or just leave it unchanged? 

[Peng, 2011/10/25 22:01:21]

Done.

                               bool handled);
 
   // Processes a key event that was already filtered by the input method.
@@ -96,7 +98,7 @@ class InputMethodIBus : public InputMethodBase {
 
   // Processes a key event that was not filtered by the input method.
   void ProcessUnfilteredKeyPressEvent(const KeyEvent& key,
-                                      guint32 ibus_keycode);
+                                      unsigned int ibus_keycode);

[James Su, 2011/10/25 19:15:03]

ditto.

[Peng, 2011/10/25 22:01:21]

Done.

 
   // Sends input method result caused by the given key event to the focused text
   // input client.