Get rid of use of deprecated members in ImeLookupTable.

chrome/browser/chromeos/text_input/candidate_window.cc

 // Copyright (c) 2009 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.
 //
 // TODO(satorux):
 // - Implement a horizontal candidate window.
 // - Implement a scroll bar or an indicator showing where you are in the
 //   candidate window.
 
 #include <algorithm>
@@ skipping 145 matching lines @@
   // Resizes the parent frame and schedules painting. This needs to be
   // called when the visible contents of the candidate window are
   // modified.
   void ResizeAndSchedulePaint();
 
   // The orientation of the candidate window.
   Orientation orientation_;
 
   // The lookup table (candidates).
   ImeLookupTable lookup_table_;
+
+  // Zero-origin index of the current page. If the cursor is on the first
+  // page, the value will be 0.
+  int current_page_index_;
+
   // The index in the current page of the candidate currently being selected.
   int selected_candidate_index_in_page_;
+
   // The observers of the object.
   ObserverList<Observer> observers_;
 
   // The parent frame.
   views::Widget* parent_frame_;
 
   // Views created in the class will be part of tree of |this|, so these
   // child views will be deleted when |this| is deleted.
 
   // The candidate area is where candidates are rendered.
@@ skipping 272 matching lines @@
                                        bool canceled) {
   // Commit the current candidate unless it's canceled.
   if (!canceled) {
     parent_candidate_window_->CommitCandidate();
   }
 }
 
 CandidateWindowView::CandidateWindowView(
     views::Widget* parent_frame)
     : orientation_(kVertical),
+      current_page_index_(0),
       selected_candidate_index_in_page_(0),
       parent_frame_(parent_frame),
       candidate_area_(NULL),
       footer_area_(NULL),
       header_area_(NULL),
       auxiliary_text_label_(NULL),
       footer_label_(NULL) {
 }
 
 void CandidateWindowView::Init() {
@@ skipping 56 matching lines @@
   Orientation orientation = kVertical;
   if (lookup_table.page_size == 5) {
     orientation = kHorizontal;
   }
   // Initialize candidate views if necessary.
   MaybeInitializeCandidateViews(lookup_table.page_size,
                                 orientation);
   lookup_table_ = lookup_table;
   orientation_ = orientation;
 
+  // Compute the index of the current page.
+  current_page_index_ =
+      lookup_table.cursor_absolute_index / lookup_table.page_size;
+
   // Update the candidates in the current page.
-  const int start_from = (lookup_table_.current_page_index *
-                          lookup_table_.page_size);
+  const int start_from = current_page_index_ * lookup_table.page_size;
+
   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;
     if (candidate_index < lookup_table_.candidates.size()) {
       candidate_views_[index_in_page]->SetCandidateText(
           UTF8ToWide(lookup_table_.candidates[candidate_index]));
     } else {
       // Disable the empty row.
       candidate_views_[index_in_page]->Disable();
     }
   }
 
-  // Select the current candidate per the lookup table.
-  // TODO(satorux): Rename cursor_row_index to cursor_index_in_page.
-  SelectCandidateAt(lookup_table_.cursor_row_index);
+  // Select the first candidate candidate in the page.
+  const int first_candidate_in_page =
+      lookup_table.cursor_absolute_index % lookup_table.page_size;
+  SelectCandidateAt(first_candidate_in_page);
 }
 
 void CandidateWindowView::MaybeInitializeCandidateViews(
     int num_views,
     Orientation orientation) {
   // If the requested number of views matches the number of current views,
   // just reuse these.
   if (num_views == static_cast<int>(candidate_views_.size()) &&
       orientation == orientation_) {
     return;
@@ skipping 106 matching lines @@
           kFooterBottomColor));
 
   views::View* footer_area = new views::View;
   footer_area->SetLayoutManager(new views::FillLayout);
   // Initialize the footer area with the place holder (i.e. show nothing).
   footer_area->AddChildView(footer_area_place_holder_.get());
   return footer_area;
 }
 
 void CandidateWindowView::SelectCandidateAt(int index_in_page) {
+  int cursor_absolute_index =
+      lookup_table_.page_size * current_page_index_ + index_in_page;
   // Ignore click on out of range views.
-  if (index_in_page >= lookup_table_.num_candidates_in_current_page) {
+  if (cursor_absolute_index < 0 ||
+      cursor_absolute_index >=
+      static_cast<int>(lookup_table_.candidates.size())) {
     return;
   }
 
   // Remember the currently selected candidate index in the current page.
   selected_candidate_index_in_page_ = index_in_page;
 
   // Unselect all the candidate first. Theoretically, we could remember
   // the lastly selected candidate and only unselect it, but unselecting
   // everything is simpler.
   for (size_t i = 0; i < candidate_views_.size(); ++i) {
     candidate_views_[i]->Unselect();
   }
   // Select the candidate specified by index_in_page.
   candidate_views_[index_in_page]->Select();
 
   // Update the cursor indexes in the model.
-  lookup_table_.cursor_row_index = index_in_page;
-  lookup_table_.cursor_absolute_index =
-      (lookup_table_.page_size * lookup_table_.current_page_index +
-       index_in_page);
+  lookup_table_.cursor_absolute_index = cursor_absolute_index;
 
   // Update the footer area.
   footer_area_->RemoveAllChildViews(false);  // Don't delete child views.
   if (orientation_ == kVertical) {
     // Show information about the cursor and the page in the footer area.
+    // TODO(satorux): This only works with engines that return all
+    // candidates (i.e. ibus-anthy).
     footer_label_->SetText(
         StringPrintf(L"%d/%d",
                      lookup_table_.cursor_absolute_index + 1,
                      lookup_table_.candidates.size()));
     footer_area_->AddChildView(footer_area_contents_.get());
   } else {
     // Show nothing in the footer area if the orientation is horizontal.
     footer_area_->AddChildView(footer_area_place_holder_.get());
   }
 
@@ skipping 222 matching lines @@
   // Create the candidate window controller.
   chromeos::CandidateWindowController controller;
   controller.Init();
 
   // Start the main loop.
   views::AcceleratorHandler accelerator_handler;
   MessageLoopForUI::current()->Run(&accelerator_handler);
 
   return 0;
 }