Remove IBusUiController.

chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc

 // 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.
 
 #include "chrome/browser/chromeos/input_method/candidate_window_controller_impl.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 17 matching lines @@
 namespace {
 // The milliseconds of the delay to show the infolist window.
 const int kInfolistShowDelayMilliSeconds = 500;
 // The milliseconds of the delay to hide the infolist window.
 const int kInfolistHideDelayMilliSeconds = 500;
 
 // Converts from ibus::Rect to gfx::Rect.
 gfx::Rect IBusRectToGfxRect(const ibus::Rect& rect) {
   return gfx::Rect(rect.x, rect.y, rect.width, rect.height);
 }
+
+// Returns pointer of IBusPanelService. This function returns NULL if it is not
+// ready.
+ibus::IBusPanelService* GetIBusPanelService() {
+  return DBusThreadManager::Get()->GetIBusPanelService();
+}
 }  // namespace
 
 bool CandidateWindowControllerImpl::Init(IBusController* controller) {
   if (controller)
     controller->AddObserver(this);
   // Create the candidate window view.
   CreateView();
-
-  // The observer should be added before Connect() so we can capture the
-  // initial connection change.
-  ibus_ui_controller_->AddObserver(this);
   return true;
 }
 
 void CandidateWindowControllerImpl::Shutdown(IBusController* controller) {
   if (controller)
     controller->RemoveObserver(this);
 }
 
 void CandidateWindowControllerImpl::CreateView() {
   // Create a non-decorated frame.
@@ skipping 34 matching lines @@
       infolist_window_->GetNativeView(),
       views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
 #endif  // USE_ASH
 
   InfolistWindowView* infolist_view = new InfolistWindowView;
   infolist_view->Init();
   infolist_window_->SetContentsView(infolist_view);
 }
 
 CandidateWindowControllerImpl::CandidateWindowControllerImpl()
-    : ibus_ui_controller_(new IBusUiController),
-      candidate_window_(NULL),
+    : candidate_window_(NULL),
       infolist_window_(NULL),
       latest_infolist_focused_index_(InfolistWindowView::InvalidFocusIndex()) {
 }
 
 CandidateWindowControllerImpl::~CandidateWindowControllerImpl() {
   if (DBusThreadManager::Get()->GetIBusPanelService())
     DBusThreadManager::Get()->GetIBusPanelService()->
         SetUpCandidateWindowHandler(NULL);
-  ibus_ui_controller_->RemoveObserver(this);
   candidate_window_->RemoveObserver(this);
-  // ibus_ui_controller_'s destructor will close the connection.
 }
 
-void CandidateWindowControllerImpl::OnHideAuxiliaryText() {
+void CandidateWindowControllerImpl::HideAuxiliaryText() {
   candidate_window_->HideAuxiliaryText();
 }
 
-void CandidateWindowControllerImpl::OnHideLookupTable() {
+void CandidateWindowControllerImpl::HideLookupTable() {
   candidate_window_->HideLookupTable();
   infolist_window_->Hide();
 }
 
-void CandidateWindowControllerImpl::OnHidePreeditText() {
+void CandidateWindowControllerImpl::HidePreeditText() {
   candidate_window_->HidePreeditText();
 }
 
-void CandidateWindowControllerImpl::OnSetCursorLocation(
+void CandidateWindowControllerImpl::SetCursorLocation(
     const ibus::Rect& cursor_location,
     const ibus::Rect& composition_head) {
   // A workaround for http://crosbug.com/6460. We should ignore very short Y
   // move to prevent the window from shaking up and down.
   const int kKeepPositionThreshold = 2;  // px
   const gfx::Rect& last_location =
       candidate_window_->cursor_location();
   const int delta_y = abs(last_location.y() - cursor_location.y);
   if ((last_location.x() == cursor_location.x) &&
       (delta_y <= kKeepPositionThreshold)) {
     DVLOG(1) << "Ignored set_cursor_location signal to prevent window shake";
     return;
   }
 
   // Remember the cursor location.
   candidate_window_->set_cursor_location(IBusRectToGfxRect(cursor_location));
   candidate_window_->set_composition_head_location(
       IBusRectToGfxRect(composition_head));
   // Move the window per the cursor location.
   candidate_window_->ResizeAndMoveParentFrame();
   UpdateInfolistBounds();
 }
 
-void CandidateWindowControllerImpl::OnUpdateAuxiliaryText(
+void CandidateWindowControllerImpl::UpdateAuxiliaryText(
     const std::string& utf8_text,
     bool visible) {
   // If it's not visible, hide the auxiliary text and return.
   if (!visible) {
     candidate_window_->HideAuxiliaryText();
     return;
   }
   candidate_window_->UpdateAuxiliaryText(utf8_text);
   candidate_window_->ShowAuxiliaryText();
 }
@@ skipping 41 matching lines @@
 
   for (size_t i = 0; i < old_entries.size(); ++i) {
     if (old_entries[i].title != new_entries[i].title ||
         old_entries[i].body != new_entries[i].body ) {
       return true;
     }
   }
   return false;
 }
 
-void CandidateWindowControllerImpl::OnUpdateLookupTable(
+void CandidateWindowControllerImpl::UpdateLookupTable(
     const ibus::IBusLookupTable& lookup_table,
     bool visible) {
   // If it's not visible, hide the lookup table and return.
   if (!visible) {
     candidate_window_->HideLookupTable();
     infolist_window_->Hide();
     // TODO(nona): Introduce unittests for crbug.com/170036.
     latest_infolist_entries_.clear();
     return;
   }
@@ skipping 52 matching lines @@
   new_bounds.set_origin(GetInfolistWindowPosition(
         frame_->GetClientAreaBoundsInScreen(),
         ash::Shell::GetScreen()->GetDisplayNearestWindow(
             infolist_window_->GetNativeView()).work_area(),
         new_bounds.size()));
 
   if (current_bounds != new_bounds)
     infolist_window_->SetBounds(new_bounds);
 }
 
-void CandidateWindowControllerImpl::OnUpdatePreeditText(
+void CandidateWindowControllerImpl::UpdatePreeditText(
     const std::string& utf8_text, unsigned int cursor, bool visible) {
   // If it's not visible, hide the preedit text and return.
   if (!visible || utf8_text.empty()) {
     candidate_window_->HidePreeditText();
     return;
   }
   candidate_window_->UpdatePreeditText(utf8_text);
   candidate_window_->ShowPreeditText();
 }
 
 void CandidateWindowControllerImpl::OnCandidateCommitted(int index,
                                                          int button,
                                                          int flags) {
-  ibus_ui_controller_->NotifyCandidateClicked(index, button, flags);
+  GetIBusPanelService()->CandidateClicked(
+      index,
+      static_cast<ibus::IBusMouseButton>(button),
+      flags);
 }
 
 void CandidateWindowControllerImpl::OnCandidateWindowOpened() {
   FOR_EACH_OBSERVER(CandidateWindowController::Observer, observers_,
                     CandidateWindowOpened());
 }
 
 void CandidateWindowControllerImpl::OnCandidateWindowClosed() {
   FOR_EACH_OBSERVER(CandidateWindowController::Observer, observers_,
                     CandidateWindowClosed());
 }
 
 void CandidateWindowControllerImpl::AddObserver(
     CandidateWindowController::Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void CandidateWindowControllerImpl::RemoveObserver(
     CandidateWindowController::Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void CandidateWindowControllerImpl::PropertyChanged() {
 }
 
 void CandidateWindowControllerImpl::OnConnected() {
   DBusThreadManager::Get()->GetIBusPanelService()->SetUpCandidateWindowHandler(
-      ibus_ui_controller_.get());
+      this);
 }
 
 void CandidateWindowControllerImpl::OnDisconnected() {
   candidate_window_->HideAll();
   infolist_window_->Hide();
   DBusThreadManager::Get()->GetIBusPanelService()->SetUpCandidateWindowHandler(
       NULL);
 }
 
 // static
 gfx::Point CandidateWindowControllerImpl::GetInfolistWindowPosition(
     const gfx::Rect& candidate_window_rect,
     const gfx::Rect& screen_rect,
     const gfx::Size& infolist_window_size) {
   gfx::Point result(candidate_window_rect.right(), candidate_window_rect.y());
 
   if (candidate_window_rect.right() + infolist_window_size.width() >
       screen_rect.right())
     result.set_x(candidate_window_rect.x() - infolist_window_size.width());
 
   if (candidate_window_rect.y() + infolist_window_size.height() >
       screen_rect.bottom())
     result.set_y(screen_rect.bottom() - infolist_window_size.height());
 
   return result;
 }
 
 }  // namespace input_method
 }  // namespace chromeos