Remove PendingCreateICRequest.

ui/base/ime/input_method_ibus.h

 // Copyright (c) 2012 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 UI_BASE_IME_INPUT_METHOD_IBUS_H_
 #define UI_BASE_IME_INPUT_METHOD_IBUS_H_
 
 #include <set>
 #include <string>
 
@@ skipping 49 matching lines @@
   // The caller is not allowed to delete the object.
   internal::IBusClient* ibus_client() const;
 
  protected:
   // Converts |text| into CompositionText.
   void ExtractCompositionText(const chromeos::ibus::IBusText& text,
                               uint32 cursor_position,
                               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,
                                          TextInputClient* focused) OVERRIDE;
   virtual void OnDidChangeFocusedClient(TextInputClient* focused_before,
                                         TextInputClient* focused) OVERRIDE;
 
   // Creates context asynchronously.
   void CreateContext();
 
@@ skipping 71 matching lines @@
 
   // Event handlers for IBusInputContext:
   void OnCommitText(const chromeos::ibus::IBusText& text);
   void OnForwardKeyEvent(uint32 keyval, uint32 keycode, uint32 status);
   void OnShowPreeditText();
   void OnUpdatePreeditText(const chromeos::ibus::IBusText& text,
                            uint32 cursor_pos,
                            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);
 
   scoped_ptr<internal::IBusClient> ibus_client_;
 
   // 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.
   // 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
   // processing result of the pending key event.
   CompositionText composition_;
 
   // Pending result text generated by the current pending key event.
   // It'll be sent to the focused text input client as soon as we receive the
   // processing result of the pending key event.
   string16 result_text_;
@@ skipping 19 matching lines @@
 
   // Used for making callbacks.
   base::WeakPtrFactory<InputMethodIBus> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodIBus);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_IME_INPUT_METHOD_IBUS_H_