Rename IBusLookupTable to CandidateWindow, and move it to chromeos/ime.

chrome/browser/chromeos/input_method/input_method_engine_ibus.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/input_method_engine_ibus.h"
 
 #define XK_MISCELLANY
 #include <X11/keysymdef.h>
 #include <map>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/ibus/ibus_client.h"
 #include "chromeos/dbus/ibus/ibus_component.h"
 #include "chromeos/dbus/ibus/ibus_engine_factory_service.h"
 #include "chromeos/dbus/ibus/ibus_engine_service.h"
-#include "chromeos/dbus/ibus/ibus_lookup_table.h"
 #include "chromeos/dbus/ibus/ibus_text.h"
+#include "chromeos/ime/candidate_window.h"
 #include "chromeos/ime/component_extension_ime_manager.h"
 #include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/ibus_keymap.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "dbus/object_path.h"
 
 namespace chromeos {
 const char* kErrorNotActive = "IME is not active";
 const char* kErrorWrongContext = "Context is not active";
 const char* kCandidateNotFound = "Candidate not found";
@@ skipping 11 matching lines @@
     : focused_(false),
       active_(false),
       context_id_(0),
       next_context_id_(1),
       aux_text_(new IBusText()),
       aux_text_visible_(false),
       observer_(NULL),
       preedit_text_(new IBusText()),
       preedit_cursor_(0),
       component_(new IBusComponent()),
-      table_(new IBusLookupTable()),
+      candidate_window_(new input_method::CandidateWindow()),
       window_visible_(false),
       weak_ptr_factory_(this) {
 }
 
 InputMethodEngineIBus::~InputMethodEngineIBus() {
   input_method::InputMethodManager::Get()->RemoveInputMethodExtension(ibus_id_);
 
   // Do not unset engine before removing input method extension, above function
   // may call reset function of engine object.
   // TODO(nona): Call Reset manually here and remove relevant code from
@@ skipping 154 matching lines @@
   return true;
 }
 
 const InputMethodEngineIBus::CandidateWindowProperty&
 InputMethodEngineIBus::GetCandidateWindowProperty() const {
   return candidate_window_property_;
 }
 
 void InputMethodEngineIBus::SetCandidateWindowProperty(
     const CandidateWindowProperty& property) {
-  IBusLookupTable::CandidateWindowProperty ibus_property;
-  ibus_property.page_size = property.page_size;
-  ibus_property.is_cursor_visible = property.is_cursor_visible;
-  ibus_property.is_vertical = property.is_vertical;
-  ibus_property.show_window_at_composition =
+  // Type conversion from InputMethodEngine::CandidateWindowProperty to
+  // CandidateWindow::CandidateWindowProperty defined in chromeos/ime/.
+  input_method::CandidateWindow::CandidateWindowProperty dest_property;
+  dest_property.page_size = property.page_size;
+  dest_property.is_cursor_visible = property.is_cursor_visible;
+  dest_property.is_vertical = property.is_vertical;
+  dest_property.show_window_at_composition =
       property.show_window_at_composition;
-  ibus_property.cursor_position = table_->GetProperty().cursor_position;
-  table_->SetProperty(ibus_property);
+  dest_property.cursor_position =
+      candidate_window_->GetProperty().cursor_position;
+  candidate_window_->SetProperty(dest_property);
   candidate_window_property_ = property;
 
   if (active_) {
-    IBusPanelCandidateWindowHandlerInterface* candidate_window =
-      IBusBridge::Get()->GetCandidateWindowHandler();
-    if (candidate_window)
-      candidate_window->UpdateLookupTable(*table_, window_visible_);
+    IBusPanelCandidateWindowHandlerInterface* cw_handler =
+        IBusBridge::Get()->GetCandidateWindowHandler();
+    if (cw_handler)
+      cw_handler->UpdateLookupTable(*candidate_window_, window_visible_);
   }
 }
 
 bool InputMethodEngineIBus::SetCandidateWindowVisible(bool visible,
                                                       std::string* error) {
   if (!active_) {
     *error = kErrorNotActive;
     return false;
   }
 
   window_visible_ = visible;
-  IBusPanelCandidateWindowHandlerInterface* candidate_window =
+  IBusPanelCandidateWindowHandlerInterface* cw_handler =
     IBusBridge::Get()->GetCandidateWindowHandler();
-  if (candidate_window)
-    candidate_window->UpdateLookupTable(*table_, window_visible_);
+  if (cw_handler)
+    cw_handler->UpdateLookupTable(*candidate_window_, window_visible_);
   return true;
 }
 
 void InputMethodEngineIBus::SetCandidateWindowAuxText(const char* text) {
   aux_text_->set_text(text);
   if (active_) {
     // Should not show auxiliary text if the whole window visibility is false.
     GetCurrentService()->UpdateAuxiliaryText(
         *aux_text_.get(),
         window_visible_ && aux_text_visible_);
@@ skipping 19 matching lines @@
     return false;
   }
   if (context_id != context_id_ || context_id_ == -1) {
     *error = kErrorWrongContext;
     return false;
   }
 
   // TODO: Nested candidates
   candidate_ids_.clear();
   candidate_indexes_.clear();
-  table_->mutable_candidates()->clear();
+  candidate_window_->mutable_candidates()->clear();
   for (std::vector<Candidate>::const_iterator ix = candidates.begin();
        ix != candidates.end(); ++ix) {
-    IBusLookupTable::Entry entry;
+    input_method::CandidateWindow::Entry entry;
     entry.value = ix->value;
     entry.label = ix->label;
     entry.annotation = ix->annotation;
     entry.description_title = ix->usage.title;
     entry.description_body = ix->usage.body;
 
     // Store a mapping from the user defined ID to the candidate index.
     candidate_indexes_[ix->id] = candidate_ids_.size();
     candidate_ids_.push_back(ix->id);
 
-    table_->mutable_candidates()->push_back(entry);
+    candidate_window_->mutable_candidates()->push_back(entry);
   }
   if (active_) {
-    IBusPanelCandidateWindowHandlerInterface* candidate_window =
+    IBusPanelCandidateWindowHandlerInterface* cw_handler =
       IBusBridge::Get()->GetCandidateWindowHandler();
-    if (candidate_window)
-      candidate_window->UpdateLookupTable(*table_, window_visible_);
+    if (cw_handler)
+      cw_handler->UpdateLookupTable(*candidate_window_, window_visible_);
   }
   return true;
 }
 
 bool InputMethodEngineIBus::SetCursorPosition(int context_id, int candidate_id,
                                               std::string* error) {
   if (!active_) {
     *error = kErrorNotActive;
     return false;
   }
   if (context_id != context_id_ || context_id_ == -1) {
     *error = kErrorWrongContext;
     return false;
   }
 
   std::map<int, int>::const_iterator position =
       candidate_indexes_.find(candidate_id);
   if (position == candidate_indexes_.end()) {
     *error = kCandidateNotFound;
     return false;
   }
 
-  table_->set_cursor_position(position->second);
-  IBusPanelCandidateWindowHandlerInterface* candidate_window =
+  candidate_window_->set_cursor_position(position->second);
+  IBusPanelCandidateWindowHandlerInterface* cw_handler =
     IBusBridge::Get()->GetCandidateWindowHandler();
-  if (candidate_window)
-    candidate_window->UpdateLookupTable(*table_, window_visible_);
+  if (cw_handler)
+    cw_handler->UpdateLookupTable(*candidate_window_, window_visible_);
   return true;
 }
 
 bool InputMethodEngineIBus::SetMenuItems(const std::vector<MenuItem>& items) {
   return UpdateMenuItems(items);
 }
 
 bool InputMethodEngineIBus::UpdateMenuItems(
     const std::vector<MenuItem>& items) {
   if (!active_)
@@ skipping 254 matching lines @@
   DBusThreadManager::Get()->RemoveIBusEngineService(object_path_);
 
   object_path_ = DBusThreadManager::Get()->GetIBusEngineFactoryService()->
       GenerateUniqueObjectPath();
 
   GetCurrentService()->SetEngine(this);
   sender.Run(object_path_);
 }
 
 }  // namespace chromeos