Remove IBusUiController.

chrome/browser/chromeos/input_method/candidate_window_controller_impl.h

Index: chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
diff --git a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
index b0882c0045fad5b6178cf647f41e6e2b38f973f0..78b357489f3a9554aac9859634e3839ac735ef6a 100644
--- a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
+++ b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.h
@@ -12,6 +12,7 @@
 #include "chrome/browser/chromeos/input_method/candidate_window_view.h"
 #include "chrome/browser/chromeos/input_method/ibus_controller.h"
 #include "chrome/browser/chromeos/input_method/infolist_window_view.h"
+#include "chromeos/dbus/ibus/ibus_panel_service.h"
 
 namespace views {
 class Widget;
@@ -28,10 +29,11 @@ class DelayableWidget;
 
 // The implementation of CandidateWindowController.
 // CandidateWindowController controls the CandidateWindow.
-class CandidateWindowControllerImpl : public CandidateWindowController,
-                                      public CandidateWindowView::Observer,
-                                      public IBusUiController::Observer,
-                                      public IBusController::Observer {
+class CandidateWindowControllerImpl
+    : public CandidateWindowController,
+      public CandidateWindowView::Observer,
+      public ibus::IBusPanelCandidateWindowHandlerInterface,
+      public IBusController::Observer {
  public:
   CandidateWindowControllerImpl();
   virtual ~CandidateWindowControllerImpl();
@@ -81,19 +83,18 @@ class CandidateWindowControllerImpl : public CandidateWindowController,
   // Creates the candidate window view.
   void CreateView();
 
-  // IBusUiController::Observer overrides.
-  virtual void OnHideAuxiliaryText() OVERRIDE;
-  virtual void OnHideLookupTable() OVERRIDE;
-  virtual void OnHidePreeditText() OVERRIDE;
-  virtual void OnSetCursorLocation(const ibus::Rect& cursor_position,
-                                   const ibus::Rect& composition_head) OVERRIDE;
-  virtual void OnUpdateAuxiliaryText(const std::string& utf8_text,
-                                     bool visible) OVERRIDE;
-  virtual void OnUpdateLookupTable(
-      const ibus::IBusLookupTable& lookup_table,
-      bool visible) OVERRIDE;
-  virtual void OnUpdatePreeditText(const std::string& utf8_text,
-                                   unsigned int cursor, bool visible) OVERRIDE;
+  // ibus::IBusPanelCandidateWindowHandlerInterface overrides.
+  virtual void HideAuxiliaryText() OVERRIDE;
+  virtual void HideLookupTable() OVERRIDE;
+  virtual void HidePreeditText() OVERRIDE;
+  virtual void SetCursorLocation(const ibus::Rect& cursor_position,
+                                 const ibus::Rect& composition_head) OVERRIDE;
+  virtual void UpdateAuxiliaryText(const std::string& utf8_text,
+                                   bool visible) OVERRIDE;
+  virtual void UpdateLookupTable(const ibus::IBusLookupTable& lookup_table,
+                                 bool visible) OVERRIDE;
+  virtual void UpdatePreeditText(const std::string& utf8_text,
+                                 unsigned int cursor, bool visible) OVERRIDE;
 
   // IBusController::Observer override
   virtual void PropertyChanged() OVERRIDE;
@@ -104,9 +105,6 @@ class CandidateWindowControllerImpl : public CandidateWindowController,
   // does nothing.
   void UpdateInfolistBounds();
 
-  // The controller is used for communicating with the IBus daemon.
-  scoped_ptr<IBusUiController> ibus_ui_controller_;
-
   // The candidate window view.
   CandidateWindowView* candidate_window_;