Introduces 'highlighted' property to candidate view.

ash/ime/candidate_window_view.cc

 // Copyright 2014 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 "ash/ime/candidate_window_view.h"
 
 #include <string>
 
 #include "ash/ime/candidate_view.h"
 #include "ash/ime/candidate_window_constants.h"
@@ skipping 265 matching lines @@
     int max_candidate_width = 0;
     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 candidate text.
       if (candidate_index < new_candidate_window.candidates().size()) {
         const ui::CandidateWindow::Entry& entry =
             new_candidate_window.candidates()[candidate_index];
         candidate_view->SetEntry(entry);
-        candidate_view->SetState(views::Button::STATE_NORMAL);
+        candidate_view->SetEnabled(true);
         candidate_view->SetInfolistIcon(!entry.description_title.empty());
       } else {
         // Disable the empty row.
         candidate_view->SetEntry(ui::CandidateWindow::Entry());
-        candidate_view->SetState(views::Button::STATE_DISABLED);
+        candidate_view->SetEnabled(false);
         candidate_view->SetInfolistIcon(false);
       }
       if (new_candidate_window.orientation() == ui::CandidateWindow::VERTICAL) {
         int shortcut_width = 0;
         int candidate_width = 0;
         candidate_views_[i]->GetPreferredWidths(
             &shortcut_width, &candidate_width);
         max_shortcut_width = std::max(max_shortcut_width, shortcut_width);
         max_candidate_width = std::max(max_candidate_width, candidate_width);
       }
@@ skipping 19 matching lines @@
     if (candidate_window_.page_size()) {
       const int current_candidate_in_page =
           candidate_window_.cursor_position() % candidate_window_.page_size();
       SelectCandidateAt(current_candidate_in_page);
     }
   } else {
     // Unselect the currently selected candidate.
     if (0 <= selected_candidate_index_in_page_ &&
         static_cast<size_t>(selected_candidate_index_in_page_) <
         candidate_views_.size()) {
-      candidate_views_[selected_candidate_index_in_page_]->SetState(
-          views::Button::STATE_NORMAL);
+      candidate_views_[selected_candidate_index_in_page_]->SetHighlighted(
+          false);
       selected_candidate_index_in_page_ = -1;
     }
   }
 
   // Updates auxiliary text
   auxiliary_text_->SetVisible(candidate_window_.is_auxiliary_text_visible());
   auxiliary_text_->SetText(base::UTF8ToUTF16(
       candidate_window_.auxiliary_text()));
 }
 
@@ skipping 38 matching lines @@
   if (cursor_absolute_index < 0 ||
       candidate_window_.candidates().size() <=
       static_cast<size_t>(cursor_absolute_index)) {
     return;
   }
 
   // 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]->SetState(views::Button::STATE_PRESSED);
+  candidate_views_[index_in_page]->SetHighlighted(true);
 
   // Update the cursor indexes in the model.
   candidate_window_.set_cursor_position(cursor_absolute_index);
 }
 
 void CandidateWindowView::ButtonPressed(views::Button* sender,
                                         const ui::Event& event) {
   for (size_t i = 0; i < candidate_views_.size(); ++i) {
     if (sender == candidate_views_[i]) {
       FOR_EACH_OBSERVER(Observer, observers_, OnCandidateCommitted(i));
       return;
     }
   }
 }
 
 }  // namespace ime
 }  // namespace ash