Remove InputMethodLookupTable and use IBusLookupTable instead.

chrome/browser/chromeos/input_method/candidate_window_view.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_view.h"
 
 #include <string>
 
 #include "ash/shell.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/input_method/candidate_view.h"
 #include "chrome/browser/chromeos/input_method/candidate_window_constants.h"
 #include "chrome/browser/chromeos/input_method/hidable_area.h"
 #include "chrome/browser/chromeos/input_method/ibus_ui_controller.h"
+#include "chromeos/dbus/ibus/ibus_lookup_table.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace chromeos {
 namespace input_method {
 
 namespace {
 // VerticalCandidateLabel is used for rendering candidate text in
 // the vertical candidate window.
@@ skipping 37 matching lines @@
       views::GridLayout::FILL, views::GridLayout::FILL,
       1, views::GridLayout::USE_PREF, 0, 0);
   layout->StartRow(0, 0);
 
   // Add the view contents.
   layout->AddView(view);  // |view| is owned by |wraper|, not |layout|.
   return wrapper;
 }
 
 // Creates shortcut text from the given index and the orientation.
-string16 CreateShortcutText(int index,
-                            const InputMethodLookupTable& table) {
-  if (table.labels.empty() ||
-      index >= static_cast<int>(table.labels.size()))
+string16 CreateShortcutText(size_t index, const ibus::IBusLookupTable& table) {
+  if (index >= table.candidates().size())
     return UTF8ToUTF16("");
-
-  std::string shortcut_text = table.labels[index];
-  if (table.orientation != InputMethodLookupTable::kVertical)
+  std::string shortcut_text = table.candidates()[index].label;
+  if (!shortcut_text.empty() &&
+      table.orientation() != ibus::IBusLookupTable::VERTICAL)
     shortcut_text += '.';
   return UTF8ToUTF16(shortcut_text);
 }
 
 // Creates the shortcut label, and returns it (never returns NULL).
 // The label text is not set in this function.
 views::Label* CreateShortcutLabel(
-    InputMethodLookupTable::Orientation orientation) {
+    ibus::IBusLookupTable::Orientation orientation) {
   // Create the shortcut label. The label will be owned by
   // |wrapped_shortcut_label|, hence it's deleted when
   // |wrapped_shortcut_label| is deleted.
   views::Label* shortcut_label = new views::Label;
 
-  if (orientation == InputMethodLookupTable::kVertical) {
+  if (orientation == ibus::IBusLookupTable::VERTICAL) {
     shortcut_label->SetFont(
         shortcut_label->font().DeriveFont(kFontSizeDelta, gfx::Font::BOLD));
   } else {
     shortcut_label->SetFont(
         shortcut_label->font().DeriveFont(kFontSizeDelta));
   }
   // TODO(satorux): Maybe we need to use language specific fonts for
   // candidate_label, like Chinese font for Chinese input method?
   shortcut_label->SetEnabledColor(kShortcutColor);
   shortcut_label->SetDisabledColor(kDisabledShortcutColor);
 
   return shortcut_label;
 }
 
 // Wraps the shortcut label, then decorates wrapped shortcut label
 // and returns it (never returns NULL).
 // The label text is not set in this function.
 views::View* CreateWrappedShortcutLabel(
     views::Label* shortcut_label,
-    InputMethodLookupTable::Orientation orientation) {
+    ibus::IBusLookupTable::Orientation orientation) {
   // Wrap it with padding.
   const gfx::Insets kVerticalShortcutLabelInsets(1, 6, 1, 6);
   const gfx::Insets kHorizontalShortcutLabelInsets(1, 3, 1, 0);
   const gfx::Insets insets =
-      (orientation == InputMethodLookupTable::kVertical ?
+      (orientation == ibus::IBusLookupTable::VERTICAL ?
        kVerticalShortcutLabelInsets :
        kHorizontalShortcutLabelInsets);
   views::View* wrapped_shortcut_label =
       WrapWithPadding(shortcut_label, insets);
 
   // Add decoration based on the orientation.
-  if (orientation == InputMethodLookupTable::kVertical) {
+  if (orientation == ibus::IBusLookupTable::VERTICAL) {
     // Set the background color.
     wrapped_shortcut_label->set_background(
         views::Background::CreateSolidBackground(
             kShortcutBackgroundColor));
     shortcut_label->SetBackgroundColor(
         wrapped_shortcut_label->background()->get_color());
   }
 
   return wrapped_shortcut_label;
 }
 
 // Creates the candidate label, and returns it (never returns NULL).
 // The label text is not set in this function.
 views::Label* CreateCandidateLabel(
-    InputMethodLookupTable::Orientation orientation) {
+    ibus::IBusLookupTable::Orientation orientation) {
   views::Label* candidate_label = NULL;
 
   // Create the candidate label. The label will be added to |this| as a
   // child view, hence it's deleted when |this| is deleted.
-  if (orientation == InputMethodLookupTable::kVertical) {
+  if (orientation == ibus::IBusLookupTable::VERTICAL) {
     candidate_label = new VerticalCandidateLabel;
   } else {
     candidate_label = new views::Label;
   }
 
   // Change the font size.
   candidate_label->SetFont(
       candidate_label->font().DeriveFont(kFontSizeDelta));
   candidate_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
   return candidate_label;
 }
 
 // Creates the annotation label, and return it (never returns NULL).
 // The label text is not set in this function.
 views::Label* CreateAnnotationLabel(
-    InputMethodLookupTable::Orientation orientation) {
+    ibus::IBusLookupTable::Orientation orientation) {
   // Create the annotation label.
   views::Label* annotation_label = new views::Label;
 
   // Change the font size and color.
   annotation_label->SetFont(
       annotation_label->font().DeriveFont(kFontSizeDelta));
   annotation_label->SetEnabledColor(kAnnotationColor);
   annotation_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
   return annotation_label;
 }
 
 // Computes shortcut column size.
 gfx::Size ComputeShortcutColumnSize(
-    const InputMethodLookupTable& lookup_table) {
+    const ibus::IBusLookupTable& lookup_table) {
   int shortcut_column_width = 0;
   int shortcut_column_height = 0;
   // Create the shortcut label. The label will be owned by
   // |wrapped_shortcut_label|, hence it's deleted when
   // |wrapped_shortcut_label| is deleted.
-  views::Label* shortcut_label = CreateShortcutLabel(lookup_table.orientation);
+  views::Label* shortcut_label = CreateShortcutLabel(
+      lookup_table.orientation());
   scoped_ptr<views::View> wrapped_shortcut_label(
-      CreateWrappedShortcutLabel(shortcut_label, lookup_table.orientation));
+      CreateWrappedShortcutLabel(shortcut_label, lookup_table.orientation()));
 
   // Compute the max width and height in shortcut labels.
   // We'll create temporary shortcut labels, and choose the largest width and
   // height.
-  for (int i = 0; i < lookup_table.page_size; ++i) {
+  for (size_t i = 0; i < lookup_table.page_size(); ++i) {
     shortcut_label->SetText(CreateShortcutText(i, lookup_table));
     gfx::Size text_size = wrapped_shortcut_label->GetPreferredSize();
     shortcut_column_width = std::max(shortcut_column_width, text_size.width());
     shortcut_column_height = std::max(shortcut_column_height,
                                       text_size.height());
   }
 
   return gfx::Size(shortcut_column_width, shortcut_column_height);
 }
 
 // Computes the page index. For instance, if the page size is 9, and the
 // cursor is pointing to 13th candidate, the page index will be 1 (2nd
 // page, as the index is zero-origin). Returns -1 on error.
-int ComputePageIndex(const InputMethodLookupTable& lookup_table) {
-  if (lookup_table.page_size > 0)
-    return lookup_table.cursor_absolute_index / lookup_table.page_size;
+int ComputePageIndex(const ibus::IBusLookupTable& lookup_table) {
+  if (lookup_table.page_size() > 0)
+    return lookup_table.cursor_position() / lookup_table.page_size();
   return -1;
 }
 
 // Computes candidate column size.
 gfx::Size ComputeCandidateColumnSize(
-    const InputMethodLookupTable& lookup_table) {
+    const ibus::IBusLookupTable& lookup_table) {
   int candidate_column_width = 0;
   int candidate_column_height = 0;
   scoped_ptr<views::Label> candidate_label(
-      CreateCandidateLabel(lookup_table.orientation));
+      CreateCandidateLabel(lookup_table.orientation()));
 
   // Compute the start index of |lookup_table_|.
   const int current_page_index = ComputePageIndex(lookup_table);
   if (current_page_index < 0)
     return gfx::Size(0, 0);
-  const size_t start_from = current_page_index * lookup_table.page_size;
+  const size_t start_from = current_page_index * lookup_table.page_size();
 
   // Compute the max width and height in candidate labels.
   // We'll create temporary candidate labels, and choose the largest width and
   // height.
-  for (size_t i = 0; i + start_from < lookup_table.candidates.size(); ++i) {
+  for (size_t i = 0; i + start_from < lookup_table.candidates().size(); ++i) {
     const size_t index = start_from + i;
 
     candidate_label->SetText(
-        UTF8ToUTF16(lookup_table.candidates[index]));
+        UTF8ToUTF16(lookup_table.candidates()[index].value));
     gfx::Size text_size = candidate_label->GetPreferredSize();
     candidate_column_width = std::max(candidate_column_width,
                                       text_size.width());
     candidate_column_height = std::max(candidate_column_height,
                                        text_size.height());
   }
 
   return gfx::Size(candidate_column_width, candidate_column_height);
 }
 
 // Computes annotation column size.
 gfx::Size ComputeAnnotationColumnSize(
-    const InputMethodLookupTable& lookup_table) {
+    const ibus::IBusLookupTable& lookup_table) {
   int annotation_column_width = 0;
   int annotation_column_height = 0;
   scoped_ptr<views::Label> annotation_label(
-      CreateAnnotationLabel(lookup_table.orientation));
+      CreateAnnotationLabel(lookup_table.orientation()));
 
   // Compute the start index of |lookup_table_|.
   const int current_page_index = ComputePageIndex(lookup_table);
   if (current_page_index < 0)
     return gfx::Size(0, 0);
-  const size_t start_from = current_page_index * lookup_table.page_size;
+  const size_t start_from = current_page_index * lookup_table.page_size();
 
   // Compute max width and height in annotation labels.
   // We'll create temporary annotation labels, and choose the largest width and
   // height.
-  for (size_t i = 0; i + start_from < lookup_table.annotations.size(); ++i) {
+  for (size_t i = 0; i + start_from < lookup_table.candidates().size(); ++i) {
     const size_t index = start_from + i;
 
     annotation_label->SetText(
-        UTF8ToUTF16(lookup_table.annotations[index]));
+        UTF8ToUTF16(lookup_table.candidates()[index].annotation));
     gfx::Size text_size = annotation_label->GetPreferredSize();
     annotation_column_width = std::max(annotation_column_width,
                                        text_size.width());
     annotation_column_height = std::max(annotation_column_height,
                                         text_size.height());
   }
 
   return gfx::Size(annotation_column_width, annotation_column_height);
 }
 
@@ skipping 39 matching lines @@
  private:
   views::Label* label_;
   int minWidth_;
 
   DISALLOW_COPY_AND_ASSIGN(InformationTextArea);
 };
 
 CandidateView::CandidateView(
     CandidateWindowView* parent_candidate_window,
     int index_in_page,
-    InputMethodLookupTable::Orientation orientation)
+    ibus::IBusLookupTable::Orientation orientation)
     : index_in_page_(index_in_page),
       orientation_(orientation),
       parent_candidate_window_(parent_candidate_window),
       shortcut_label_(NULL),
       candidate_label_(NULL),
       annotation_label_(NULL),
       infolist_icon_(NULL),
       infolist_icon_enabled_(false) {
 }
 
@@ skipping 10 matching lines @@
       CreateWrappedShortcutLabel(shortcut_label_, orientation_);
   candidate_label_ = CreateCandidateLabel(orientation_);
   annotation_label_ = CreateAnnotationLabel(orientation_);
 
   // Initialize the column set with three columns.
   views::ColumnSet* column_set = layout->AddColumnSet(0);
 
   // If orientation is vertical, each column width is fixed.
   // Otherwise the width is resizable.
   const views::GridLayout::SizeType column_type =
-      orientation_ == InputMethodLookupTable::kVertical ?
+      orientation_ == ibus::IBusLookupTable::VERTICAL ?
           views::GridLayout::FIXED : views::GridLayout::USE_PREF;
 
   const int padding_column_width =
-      orientation_ == InputMethodLookupTable::kVertical ? 4 : 6;
+      orientation_ == ibus::IBusLookupTable::VERTICAL ? 4 : 6;
 
   // Set shortcut column type and width.
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
                         0, column_type, shortcut_column_width, 0);
   column_set->AddPaddingColumn(0, padding_column_width);
 
   // Set candidate column type and width.
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
                         0, column_type, candidate_column_width, 0);
   column_set->AddPaddingColumn(0, padding_column_width);
 
   // Set annotation column type and width.
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
                         0, column_type, annotation_column_width, 0);
 
-  if (orientation_ == InputMethodLookupTable::kVertical) {
+  if (orientation_ == ibus::IBusLookupTable::VERTICAL) {
     column_set->AddPaddingColumn(0, 1);
     column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 0,
                           views::GridLayout::FIXED, kInfolistIndicatorIconWidth,
                           0);
     column_set->AddPaddingColumn(0, 2);
   } else {
     column_set->AddPaddingColumn(0, padding_column_width);
   }
 
   // Add the shortcut label, the candidate label, and annotation label.
@@ skipping 14 matching lines @@
                   views::GridLayout::FILL,  // Vertical alignment.
                   -1,  // Preferred width, not specified.
                   column_height);  // Preferred height.
   layout->AddView(annotation_label_,
                   1,  // Column span.
                   1,  // Row span.
                   views::GridLayout::FILL,  // Horizontal alignment.
                   views::GridLayout::FILL,  // Vertical alignemnt.
                   -1,  // Preferred width, not specified.
                   column_height);  // Preferred height.
-  if (orientation_ == InputMethodLookupTable::kVertical) {
+  if (orientation_ == ibus::IBusLookupTable::VERTICAL) {
     infolist_icon_ = new views::View;
     views::View* infolist_icon_wrapper = new views::View;
     views::GridLayout* infolist_icon_layout =
         new views::GridLayout(infolist_icon_wrapper);
     // |infolist_icon_layout| is owned by |infolist_icon_wrapper|.
     infolist_icon_wrapper->SetLayoutManager(infolist_icon_layout);
     infolist_icon_layout->AddColumnSet(0)->AddColumn(
         views::GridLayout::FILL, views::GridLayout::FILL,
         0, views::GridLayout::FIXED, kInfolistIndicatorIconWidth, 0);
     infolist_icon_layout->AddPaddingRow(0, kInfolistIndicatorIconPadding);
@@ skipping 92 matching lines @@
   views::View::ConvertPointToTarget(this, parent_candidate_window_,
                                     &location_in_candidate_window);
   parent_candidate_window_->OnCandidatePressed(location_in_candidate_window);
   parent_candidate_window_->CommitCandidate();
   return false;
 }
 
 void CandidateView::UpdateLabelBackgroundColors() {
   SkColor color = background() ?
       background()->get_color() : kDefaultBackgroundColor;
-  if (orientation_ != InputMethodLookupTable::kVertical)
+  if (orientation_ != ibus::IBusLookupTable::VERTICAL)
     shortcut_label_->SetBackgroundColor(color);
   candidate_label_->SetBackgroundColor(color);
   annotation_label_->SetBackgroundColor(color);
 }
 
 CandidateWindowView::CandidateWindowView(views::Widget* parent_frame)
     : selected_candidate_index_in_page_(0),
       parent_frame_(parent_frame),
       preedit_area_(NULL),
       header_area_(NULL),
@@ skipping 78 matching lines @@
 }
 
 void CandidateWindowView::ShowAuxiliaryText() {
   // If candidate_area is not shown, shows auxiliary text at header_area.
   // We expect both header_area_ and footer_area_ contain same value.
   if (!candidate_area_->IsShown()) {
     header_area_->Show();
     footer_area_->Hide();
   } else {
     // If candidate_area is shown, shows auxiliary text with orientation.
-    if (lookup_table_.orientation == InputMethodLookupTable::kHorizontal) {
+    if (lookup_table_.orientation() == ibus::IBusLookupTable::HORIZONTAL) {
       header_area_->Show();
       footer_area_->Hide();
     } else {
       footer_area_->Show();
       header_area_->Hide();
     }
   }
   UpdateParentArea();
 }
 
@@ skipping 28 matching lines @@
   bool is_open = IsCandidateWindowOpen();
   if (!was_candidate_window_open_ && is_open) {
     FOR_EACH_OBSERVER(Observer, observers_, OnCandidateWindowOpened());
   } else if (was_candidate_window_open_ && !is_open) {
     FOR_EACH_OBSERVER(Observer, observers_, OnCandidateWindowClosed());
   }
   was_candidate_window_open_ = is_open;
 }
 
 bool CandidateWindowView::ShouldUpdateCandidateViews(
-    const InputMethodLookupTable& old_table,
-    const InputMethodLookupTable& new_table) {
-
-  // Check if most table contents are identical.
-  if (old_table.page_size == new_table.page_size &&
-      old_table.orientation == new_table.orientation &&
-      old_table.candidates == new_table.candidates &&
-      old_table.labels == new_table.labels &&
-      old_table.annotations == new_table.annotations &&
-      old_table.descriptions.size() == new_table.descriptions.size() &&
-      // Check if the page indexes are identical.
-      ComputePageIndex(old_table) == ComputePageIndex(new_table)) {
-    for (size_t i = 0; i < new_table.descriptions.size(); ++i) {
-      if (old_table.descriptions[i].title != new_table.descriptions[i].title ||
-          old_table.descriptions[i].body != new_table.descriptions[i].body)
-        return true;
-    }
-    // If all of the conditions are met, we don't have to update candidate
-    // views.
-    return false;
-  }
-  return true;
+    const ibus::IBusLookupTable& old_table,
+    const ibus::IBusLookupTable& new_table) {
+  return !old_table.IsEqual(new_table);
 }
 
 void CandidateWindowView::UpdateCandidates(
-    const InputMethodLookupTable& new_lookup_table) {
+    const ibus::IBusLookupTable& new_lookup_table) {
   const bool should_update = ShouldUpdateCandidateViews(lookup_table_,
                                                         new_lookup_table);
   // Updating the candidate views is expensive. We'll skip this if possible.
   if (should_update) {
     // Initialize candidate views if necessary.
     MaybeInitializeCandidateViews(new_lookup_table);
 
     should_show_at_composition_head_
-        = new_lookup_table.show_at_composition_head;
+        = new_lookup_table.show_window_at_composition();
     // Compute the index of the current page.
     const int current_page_index = ComputePageIndex(new_lookup_table);
     if (current_page_index < 0) {
-      DVLOG(1) << "Invalid lookup_table: " << new_lookup_table.ToString();
       return;
     }
 
     // Update the candidates in the current page.
-    const size_t start_from = current_page_index * new_lookup_table.page_size;
+    const size_t start_from = current_page_index * new_lookup_table.page_size();
 
     // In some cases, engines send empty shortcut labels. For instance,
     // ibus-mozc sends empty labels when they show suggestions. In this
     // case, we should not show shortcut labels.
-    const bool no_shortcut_mode =
-        (start_from < new_lookup_table.labels.size() &&
-         new_lookup_table.labels[start_from].empty());
+    bool no_shortcut_mode = true;
+    for (size_t i = 0; i < new_lookup_table.candidates().size(); ++i) {
+      if (!new_lookup_table.candidates()[i].label.empty()) {
+        no_shortcut_mode = false;
+        break;
+      }
+    }
+
     for (size_t i = 0; i < candidate_views_.size(); ++i) {
       const size_t index_in_page = i;
       const size_t candidate_index = start_from + index_in_page;
       CandidateView* candidate_view = candidate_views_[index_in_page];
       // Set the shortcut text.
       if (no_shortcut_mode) {
         candidate_view->SetShortcutText(string16());
       } else {
         // At this moment, we don't use labels sent from engines for UX
         // reasons. First, we want to show shortcut labels in empty rows
         // (ex. show 6, 7, 8, ... in empty rows when the number of
         // candidates is 5). Second, we want to add a period after each
         // shortcut label when the candidate window is horizontal.
         candidate_view->SetShortcutText(
             CreateShortcutText(i, new_lookup_table));
       }
       // Set the candidate text.
-      if (candidate_index < new_lookup_table.candidates.size() &&
-          candidate_index < new_lookup_table.annotations.size()) {
-        candidate_view->SetCandidateText(
-            UTF8ToUTF16(new_lookup_table.candidates[candidate_index]));
-        candidate_view->SetAnnotationText(
-            UTF8ToUTF16(new_lookup_table.annotations[candidate_index]));
-        candidate_view->SetRowEnabled(true);
-
-        candidate_view->SetInfolistIcon(
-            !new_lookup_table.descriptions[candidate_index].title.empty());
+       if (candidate_index < new_lookup_table.candidates().size()) {
+         const ibus::IBusLookupTable::Entry& entry =
+             new_lookup_table.candidates()[candidate_index];
+         candidate_view->SetCandidateText(UTF8ToUTF16(entry.value));
+         candidate_view->SetAnnotationText(UTF8ToUTF16(entry.annotation));
+         candidate_view->SetRowEnabled(true);
+         candidate_view->SetInfolistIcon(!entry.description_title.empty());
       } else {
         // Disable the empty row.
         candidate_view->SetCandidateText(string16());
         candidate_view->SetAnnotationText(string16());
         candidate_view->SetRowEnabled(false);
         candidate_view->SetInfolistIcon(false);
       }
     }
   }
   // Update the current lookup table. We'll use lookup_table_ from here.
   // Note that SelectCandidateAt() uses lookup_table_.
-  lookup_table_ = new_lookup_table;
+  lookup_table_.CopyFrom(new_lookup_table);
 
   // Select the current candidate in the page.
   const int current_candidate_in_page =
-      lookup_table_.cursor_absolute_index % lookup_table_.page_size;
+      lookup_table_.cursor_position() % lookup_table_.page_size();
   SelectCandidateAt(current_candidate_in_page);
 }
 
 void CandidateWindowView::MaybeInitializeCandidateViews(
-    const InputMethodLookupTable& lookup_table) {
-  const InputMethodLookupTable::Orientation orientation =
-      lookup_table.orientation;
-  const int page_size = lookup_table.page_size;
+    const ibus::IBusLookupTable& lookup_table) {
+  const ibus::IBusLookupTable::Orientation orientation =
+      lookup_table.orientation();
+  const int page_size = lookup_table.page_size();
   views::View* candidate_area_contents = candidate_area_->contents();
 
   // Current column width.
   gfx::Size shortcut_column_size(0, 0);
   gfx::Size candidate_column_size(0,0);
   gfx::Size annotation_column_size(0, 0);
 
   // If orientation is horizontal, don't need to compute width,
   // because each label is left aligned.
-  if (orientation == InputMethodLookupTable::kVertical) {
+  if (orientation == ibus::IBusLookupTable::VERTICAL) {
     shortcut_column_size = ComputeShortcutColumnSize(lookup_table);
     candidate_column_size = ComputeCandidateColumnSize(lookup_table);
     annotation_column_size = ComputeAnnotationColumnSize(lookup_table);
   }
 
   // If the requested number of views matches the number of current views, and
   // previous and current column width are same, just reuse these.
   //
   // Note that the early exit logic is not only useful for improving
   // performance, but also necessary for the horizontal candidate window
   // to be redrawn properly. If we get rid of the logic, the horizontal
   // candidate window won't get redrawn properly for some reason when
   // there is no size change. You can test this by removing "return" here
   // and type "ni" with Pinyin input method.
   if (static_cast<int>(candidate_views_.size()) == page_size &&
-      lookup_table_.orientation == orientation &&
+      lookup_table_.orientation() == orientation &&
       previous_shortcut_column_size_ == shortcut_column_size &&
       previous_candidate_column_size_ == candidate_column_size &&
       previous_annotation_column_size_ == annotation_column_size) {
     return;
   }
 
   // Update the previous column widths.
   previous_shortcut_column_size_ = shortcut_column_size;
   previous_candidate_column_size_ = candidate_column_size;
   previous_annotation_column_size_ = annotation_column_size;
 
   // Clear the existing candidate_views if any.
   for (size_t i = 0; i < candidate_views_.size(); ++i) {
     candidate_area_contents->RemoveChildView(candidate_views_[i]);
     // Delete the view after getting out the current message loop iteration.
     MessageLoop::current()->DeleteSoon(FROM_HERE, candidate_views_[i]);
   }
   candidate_views_.clear();
 
   views::GridLayout* layout = new views::GridLayout(candidate_area_contents);
   // |candidate_area_contents| owns |layout|.
   candidate_area_contents->SetLayoutManager(layout);
   // Initialize the column set.
   views::ColumnSet* column_set = layout->AddColumnSet(0);
-  if (orientation == InputMethodLookupTable::kVertical) {
+  if (orientation == ibus::IBusLookupTable::VERTICAL) {
     column_set->AddColumn(views::GridLayout::FILL,
                           views::GridLayout::FILL,
                           0, views::GridLayout::USE_PREF, 0, 0);
   } else {
     for (int i = 0; i < page_size; ++i) {
       column_set->AddColumn(views::GridLayout::FILL,
                             views::GridLayout::FILL,
                             0, views::GridLayout::USE_PREF, 0, 0);
     }
   }
 
   // Set insets so the border of the selected candidate is drawn inside of
   // the border of the main candidate window, but we don't have the inset
   // at the top and the bottom as we have the borders of the header and
   // footer areas.
   const gfx::Insets kCandidateAreaInsets(0, 1, 0, 1);
   layout->SetInsets(kCandidateAreaInsets.top(),
                     kCandidateAreaInsets.left(),
                     kCandidateAreaInsets.bottom(),
                     kCandidateAreaInsets.right());
 
   // Use maximum height for all rows in candidate area.
   const int kColumnHeight = std::max(shortcut_column_size.height(),
                                      std::max(candidate_column_size.height(),
                                               annotation_column_size.height()));
 
   // Add views to the candidate area.
-  if (orientation == InputMethodLookupTable::kHorizontal) {
+  if (orientation == ibus::IBusLookupTable::HORIZONTAL) {
     layout->StartRow(0, 0);
   }
 
   for (int i = 0; i < page_size; ++i) {
     CandidateView* candidate_row = new CandidateView(this, i, orientation);
     candidate_row->Init(shortcut_column_size.width(),
                         candidate_column_size.width(),
                         annotation_column_size.width(),
                         kColumnHeight);
     candidate_views_.push_back(candidate_row);
-    if (orientation == InputMethodLookupTable::kVertical) {
+    if (orientation == ibus::IBusLookupTable::VERTICAL) {
       layout->StartRow(0, 0);
     }
     // |candidate_row| will be owned by |candidate_area_contents|.
     layout->AddView(candidate_row,
                     1,  // Column span.
                     1,  // Row span.
                     views::GridLayout::CENTER,  // Horizontal alignment.
                     views::GridLayout::CENTER,  // Vertical alignment.
                     -1,  // Preferred width, not specified.
                     kColumnHeight);  // Preferred height.
   }
 
   // Compute views size in |layout|.
   // If we don't call this function, GetHorizontalOffset() often
   // returns invalid value (returns 0), then candidate window
   // moves right from the correct position in ResizeAndMoveParentFrame().
   // TODO(nhiroki): Figure out why it returns invalid value.
   // It seems that the x-position of the candidate labels is not set.
   layout->Layout(candidate_area_contents);
 }
 
 bool CandidateWindowView::IsCandidateWindowOpen() const {
   return !should_show_at_composition_head_ &&
       candidate_area_->visible() && candidate_area_->IsShown();
 }
 
 void CandidateWindowView::SelectCandidateAt(int index_in_page) {
   const int current_page_index = ComputePageIndex(lookup_table_);
   if (current_page_index < 0) {
-    DVLOG(1) << "Invalid lookup_table: " << lookup_table_.ToString();
     return;
   }
 
   const int cursor_absolute_index =
-      lookup_table_.page_size * current_page_index + index_in_page;
+      lookup_table_.page_size() * current_page_index + index_in_page;
   // Ignore click on out of range views.
   if (cursor_absolute_index < 0 ||
       cursor_absolute_index >=
-      static_cast<int>(lookup_table_.candidates.size())) {
+      static_cast<int>(lookup_table_.candidates().size())) {
     return;
   }
 
   // Unselect the currently selected candidate.
   candidate_views_[selected_candidate_index_in_page_]->Unselect();
   // Remember the currently selected candidate index in the current page.
   selected_candidate_index_in_page_ = index_in_page;
 
   // Select the candidate specified by index_in_page.
   candidate_views_[index_in_page]->Select();
 
   // Update the cursor indexes in the model.
-  lookup_table_.cursor_absolute_index = cursor_absolute_index;
+  lookup_table_.set_cursor_position(cursor_absolute_index);
 }
 
 void CandidateWindowView::OnCandidatePressed(
     const gfx::Point& location) {
   for (size_t i = 0; i < candidate_views_.size(); ++i) {
     gfx::Point converted_location = location;
     views::View::ConvertPointToTarget(this, candidate_views_[i],
                                       &converted_location);
     if (candidate_views_[i]->HitTestPoint(converted_location)) {
       SelectCandidateAt(i);
@@ skipping 61 matching lines @@
 
   // Move the window per the cursor location.
   // SetBounds() is not cheap. Only call this when it is really changed.
   if (frame_bounds != old_bounds)
     parent_frame_->SetBounds(frame_bounds);
 }
 
 int CandidateWindowView::GetHorizontalOffset() {
   // Compute the horizontal offset if the lookup table is vertical.
   if (!candidate_views_.empty() &&
-      lookup_table_.orientation == InputMethodLookupTable::kVertical) {
+      lookup_table_.orientation() == ibus::IBusLookupTable::VERTICAL) {
     return - candidate_views_[0]->GetCandidateLabelPosition().x();
   }
   return 0;
 }
 
 void CandidateWindowView::VisibilityChanged(View* starting_from,
                                             bool is_visible) {
   if (is_visible) {
     // If the visibility of candidate window is changed,
     // we should move the frame to the right position.
     ResizeAndMoveParentFrame();
   }
 }
 
 void CandidateWindowView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   // If the bounds(size) of candidate window is changed,
   // we should move the frame to the right position.
   View::OnBoundsChanged(previous_bounds);
   ResizeAndMoveParentFrame();
 }
 
 }  // namespace input_method
 }  // namespace chromeos