Remove ibus dependency from PanelService.

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"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/input_method/candidate_window_view.h"
 #include "chrome/browser/chromeos/input_method/delayable_widget.h"
 #include "chrome/browser/chromeos/input_method/infolist_window_view.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_animations.h"
 #endif  // USE_ASH
 
 namespace chromeos {
 namespace input_method {
 
 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;
 }  // namespace
 
 bool CandidateWindowControllerImpl::Init() {
   // 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);
-  ibus_ui_controller_->Connect();
   return true;
 }
 
 void CandidateWindowControllerImpl::CreateView() {
   // Create a non-decorated frame.
   frame_.reset(new views::Widget);
   // The size is initially zero.
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
   // |frame_| and |infolist_window_| are owned by controller impl so
   // they should use WIDGET_OWNS_NATIVE_WIDGET ownership.
@@ skipping 29 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_(IBusUiController::Create()),
+    : ibus_ui_controller_(new IBusUiController),
       candidate_window_(NULL),
       infolist_window_(NULL),
       latest_infolist_focused_index_(InfolistWindowView::InvalidFocusIndex()) {
 }
 
 CandidateWindowControllerImpl::~CandidateWindowControllerImpl() {
   ibus_ui_controller_->RemoveObserver(this);
   candidate_window_->RemoveObserver(this);
   // ibus_ui_controller_'s destructor will close the connection.
 }
@@ skipping 194 matching lines @@
 void CandidateWindowControllerImpl::AddObserver(
     CandidateWindowController::Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void CandidateWindowControllerImpl::RemoveObserver(
     CandidateWindowController::Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void CandidateWindowControllerImpl::OnConnectionChange(bool connected) {
-  if (!connected) {
-    candidate_window_->HideAll();
-    infolist_window_->Hide();
-  }
+void CandidateWindowControllerImpl::PropertyChanged() {
+}
+
+void CandidateWindowControllerImpl::OnConnected() {
+  DBusThreadManager::Get()->GetIBusPanelService()->SetUpCandidateWindowHandler(
+      ibus_ui_controller_.get());
+}
+
+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