Remove PendingCreateICRequest.

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 69e280f119f2cfb4eb85418af125746622d38842..6a412dac9bd2bde814894f14a0c52585c3e43b47 100644
--- a/ui/base/ime/input_method_ibus.h
+++ b/ui/base/ime/input_method_ibus.h
@@ -67,8 +67,12 @@ class UI_EXPORT InputMethodIBus : public InputMethodBase {
                               CompositionText* out_composition) const;
 
  private:
+  enum InputContextState {

[Yusuke Sato, 2012/08/06 17:48:35]

add comments for each enum.

[Seigo Nonaka, 2012/08/07 04:28:29]

Done.

+    INPUT_CONTEXT_STOP,
+    INPUT_CONTEXT_WAIT_CREATE_CREATE_INPUT_CONTEXT_RESPONSE,
+    INPUT_CONTEXT_RUNNING,
+  };
   class PendingKeyEvent;
-  class PendingCreateICRequest;
 
   // Overridden from InputMethodBase:
   virtual void OnWillChangeFocusedClient(TextInputClient* focused_before,
@@ -160,9 +164,8 @@ class UI_EXPORT InputMethodIBus : public InputMethodBase {
                            bool visible);
   void OnHidePreeditText();
 
-  void CreateInputContextDone(PendingCreateICRequest* ic_request,
-                              const dbus::ObjectPath& object_path);
-  void CreateInputContextFail(PendingCreateICRequest* ic_request);
+  void CreateInputContextDone(const dbus::ObjectPath& object_path);
+  void CreateInputContextFail();
   static void ProcessKeyEventDone(PendingKeyEvent* pending_key_event,
                                   bool is_handled);
   static void ProcessKeyEventFail(PendingKeyEvent* pending_key_event);
@@ -174,9 +177,9 @@ class UI_EXPORT InputMethodIBus : public InputMethodBase {
   // They will be deleted in ProcessKeyEventDone().
   std::set<PendingKeyEvent*> pending_key_events_;
 
-  // The pending request for creating the input context. We need to keep this
-  // pointer so that we can receive or abandon the result.
-  PendingCreateICRequest* pending_create_ic_request_;
+  InputContextState input_context_state_;

[Yusuke Sato, 2012/08/06 17:48:35]

comment

[Seigo Nonaka, 2012/08/07 04:28:29]

Done.

+
+  int create_input_context_fail_count_;

[Yusuke Sato, 2012/08/06 17:48:35]

comment

[Seigo Nonaka, 2012/08/07 04:28:29]

Done.

 
   // Pending composition text generated by the current pending key event.
   // It'll be sent to the focused text input client as soon as we receive the