Migrate CandidateWindow::Entry to string16.

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 96 matching lines @@
                                     ui::NativeTheme::kColorId_WindowBackground),
                                 0x10)));
   }
 
   // Sets the text alignment.
   void SetAlignment(gfx::HorizontalAlignment alignment) {
     label_->SetHorizontalAlignment(alignment);
   }
 
   // Sets the displayed text.
-  void SetText(const std::string& utf8_text) {
-    label_->SetText(base::UTF8ToUTF16(utf8_text));
+  void SetText(const base::string16& text) {
+    label_->SetText(text);
   }
 
   // Sets the border thickness for top/bottom.
   void SetBorderFromPosition(BorderPosition position) {
     SetBorder(views::Border::CreateSolidSidedBorder(
         (position == TOP) ? 1 : 0,
         0,
         (position == BOTTOM) ? 1 : 0,
         0,
         GetNativeTheme()->GetSystemColor(
@@ skipping 89 matching lines @@
 void CandidateWindowView::HidePreeditText() {
   preedit_->SetVisible(false);
   UpdateVisibility();
 }
 
 void CandidateWindowView::ShowPreeditText() {
   preedit_->SetVisible(true);
   UpdateVisibility();
 }
 
-void CandidateWindowView::UpdatePreeditText(const std::string& utf8_text) {
-  preedit_->SetText(utf8_text);
+void CandidateWindowView::UpdatePreeditText(const base::string16& text) {
+  preedit_->SetText(text);
 }
 
 void CandidateWindowView::ShowLookupTable() {
   candidate_area_->SetVisible(true);
   auxiliary_text_->SetVisible(candidate_window_.is_auxiliary_text_visible());
   UpdateVisibility();
 }
 
 void CandidateWindowView::UpdateCandidates(
     const ui::CandidateWindow& new_candidate_window) {
@@ skipping 88 matching lines @@
         static_cast<size_t>(selected_candidate_index_in_page_) <
         candidate_views_.size()) {
       candidate_views_[selected_candidate_index_in_page_]->SetState(
           views::Button::STATE_NORMAL);
       selected_candidate_index_in_page_ = -1;
     }
   }
 
   // Updates auxiliary text
   auxiliary_text_->SetVisible(candidate_window_.is_auxiliary_text_visible());
-  auxiliary_text_->SetText(candidate_window_.auxiliary_text());
+  auxiliary_text_->SetText(base::UTF8ToUTF16(
+      candidate_window_.auxiliary_text()));
 }
 
 void CandidateWindowView::SetCursorBounds(const gfx::Rect& cursor_bounds,
                                           const gfx::Rect& composition_head) {
   if (candidate_window_.show_window_at_composition())
     SetAnchorRect(composition_head);
   else
     SetAnchorRect(cursor_bounds);
 }
 
@@ skipping 48 matching lines @@
   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