Clean UP: Remove IBusClientImpl from ui/base/ime/*

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_
 #pragma once
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/base/ime/character_composer.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/ime/ibus_client.h"
 #include "ui/base/ime/input_method_base.h"
 
+namespace dbus {
+class ObjectPath;
+};

[Yusuke Sato, 2012/06/25 13:41:33]

remove ;

[Seigo Nonaka, 2012/06/28 03:43:03]

Done.

 namespace chromeos {
 namespace ibus {
 class IBusText;
 }  // namespace ibus
 }  // namespace chromeos
 
 namespace ui {
 
 // A ui::InputMethod implementation based on IBus.
 class UI_EXPORT InputMethodIBus : public InputMethodBase {
@@ skipping 27 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:
-  class PendingKeyEventImpl;
-  class PendingCreateICRequestImpl;
+  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 41 matching lines @@
 
   // Checks if there is pending input method result.
   bool HasInputMethodResult() const;
 
   // Fabricates a key event with VKEY_PROCESSKEY key code and dispatches it to
   // the focused View.
   void SendFakeProcessKeyEvent(bool pressed) const;
 
   // Called when a pending key event has finished. The event will be removed
   // from |pending_key_events_|.
-  void FinishPendingKeyEvent(PendingKeyEventImpl* pending_key);
+  void FinishPendingKeyEvent(PendingKeyEvent* pending_key);
 
   // Abandons all pending key events. It usually happends when we lose keyboard
   // focus, the text input type is changed or we are destroyed.
   void AbandonAllPendingKeyEvents();
 
   // Releases context focus and confirms the composition text. Then destroy
   // object proxy.
   void ResetInputContext();
 
+  // Returns true if the connection to ibus-daemon is established.
+  bool IsConnected();
+
+  // Returns true if the input context is ready to use.
+  bool IsContextReady();
+
   // 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(PendingCreateICRequestImpl* ic_request,
+  void CreateInputContextDone(PendingCreateICRequest* ic_request,
                               const dbus::ObjectPath& object_path);
-  static void ProcessKeyEventDone(PendingKeyEventImpl* pending_key_event,
+  void CreateInputContextFail(PendingCreateICRequest* ic_request);
+  static void ProcessKeyEventDone(PendingKeyEvent* pending_key_event,
                                   bool is_handled);
 
   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<PendingKeyEventImpl*> pending_key_events_;
+  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.
-  PendingCreateICRequestImpl* pending_create_ic_request_;
+  PendingCreateICRequest* pending_create_ic_request_;
 
   // 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 17 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_