Support IMM32 reconversion on Windows

views/ime/input_method_ibus.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef VIEWS_IME_INPUT_METHOD_IBUS_H_
 #define VIEWS_IME_INPUT_METHOD_IBUS_H_
 #pragma once
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "views/events/event.h"
 #include "views/ime/character_composer.h"
 #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;
 
 namespace views {
 
 // An InputMethod implementation based on IBus.
 class InputMethodIBus : public InputMethodBase {
  public:
   explicit InputMethodIBus(internal::InputMethodDelegate* delegate);
@@ skipping 48 matching lines @@
   void ResetContext();
 
   // Checks the availability of focused text input client and update focus state
   // of |context_| and |context_simple_| accordingly.
   void UpdateContextFocusState();
 
   // Updates focus state of |fake_context_| accordingly.
   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.
   // A VKEY_PROCESSKEY may be dispatched to the focused View.
   void ProcessFilteredKeyPressEvent(const KeyEvent& key);
 
   // 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.
   void ProcessInputMethodResult(const KeyEvent& key, bool filtered);
 
   // Checks if the pending input method result needs inserting into the focused
   // text input client as a single character.
   bool NeedInsertChar() const;
 
   // Checks if there is pending input method result.
@@ skipping 88 matching lines @@
   // An object to compose a character from a sequence of key presses
   // including dead key etc.
   CharacterComposer character_composer_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodIBus);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_IME_INPUT_METHOD_IBUS_H_