Remove InputMethodLookupTable and use IBusLookupTable instead.

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 142 matching lines @@
   if (!visible) {
     candidate_window_->HideAuxiliaryText();
     return;
   }
   candidate_window_->UpdateAuxiliaryText(utf8_text);
   candidate_window_->ShowAuxiliaryText();
 }
 
 // static
 void CandidateWindowControllerImpl::ConvertLookupTableToInfolistEntry(
-    const InputMethodLookupTable& lookup_table,
+    const ibus::IBusLookupTable& lookup_table,
     std::vector<InfolistWindowView::Entry>* infolist_entries,
     size_t* focused_index) {
   DCHECK(focused_index);
   DCHECK(infolist_entries);
   *focused_index = InfolistWindowView::InvalidFocusIndex();
   infolist_entries->clear();
 
   const size_t cursor_index_in_page =
-      lookup_table.cursor_absolute_index % lookup_table.page_size;
+      lookup_table.cursor_position() % lookup_table.page_size();
 
-  for (size_t i = 0; i < lookup_table.descriptions.size(); ++i) {
-    if (lookup_table.descriptions[i].title.empty() &&
-        lookup_table.descriptions[i].body.empty())
+  for (size_t i = 0; i < lookup_table.candidates().size(); ++i) {
+    const ibus::IBusLookupTable::Entry& ibus_entry =
+        lookup_table.candidates()[i];
+    if (ibus_entry.description_title.empty() &&
+        ibus_entry.description_body.empty())
       continue;
     InfolistWindowView::Entry entry;
-    entry.title = lookup_table.descriptions[i].title;
-    entry.body = lookup_table.descriptions[i].body;
+    entry.title = ibus_entry.description_title;
+    entry.body = ibus_entry.description_body;
     infolist_entries->push_back(entry);
     if (i == cursor_index_in_page)
       *focused_index = infolist_entries->size() - 1;
   }
 }
 
 // static
 bool CandidateWindowControllerImpl::ShouldUpdateInfolist(
     const std::vector<InfolistWindowView::Entry>& old_entries,
     size_t old_focused_index,
     const std::vector<InfolistWindowView::Entry>& new_entries,
     size_t new_focused_index) {
   if (old_entries.empty() && new_entries.empty())
     return false;
   if (old_entries.size() != new_entries.size())
     return true;
   if (old_focused_index != new_focused_index)
     return true;
 
   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(
-    const InputMethodLookupTable& lookup_table) {
+    const ibus::IBusLookupTable& lookup_table,
+    bool visible) {
   // If it's not visible, hide the lookup table and return.
-  if (!lookup_table.visible) {
+  if (!visible) {
     candidate_window_->HideLookupTable();
     infolist_window_->Hide();
     return;
   }
 
   candidate_window_->UpdateCandidates(lookup_table);
   candidate_window_->ShowLookupTable();
 
   size_t focused_index = 0;
   std::vector<InfolistWindowView::Entry> infolist_entries;
@@ skipping 118 matching lines @@
 
   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