Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2651)

Unified Diff: ash/ime/candidate_view.cc

Issue 162723003: Migrate CandidateWindow::Entry to string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix browsertest compilation Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/ime/candidate_window_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ime/candidate_view.cc
diff --git a/ash/ime/candidate_view.cc b/ash/ime/candidate_view.cc
index 82c90092387e18f498932c5963dab77e98f83412..83c930f4b7465b5b68877f1ebb3fca16278e4a02 100644
--- a/ash/ime/candidate_view.cc
+++ b/ash/ime/candidate_view.cc
@@ -174,12 +174,12 @@ void CandidateView::SetWidths(int shortcut_width, int candidate_width) {
}
void CandidateView::SetEntry(const ui::CandidateWindow::Entry& entry) {
- std::string label = entry.label;
+ base::string16 label = entry.label;
if (!label.empty() && orientation_ != ui::CandidateWindow::VERTICAL)
- label += '.';
- shortcut_label_->SetText(base::UTF8ToUTF16(label));
- candidate_label_->SetText(base::UTF8ToUTF16(entry.value));
- annotation_label_->SetText(base::UTF8ToUTF16(entry.annotation));
+ label += base::ASCIIToUTF16(".");
+ shortcut_label_->SetText(label);
+ candidate_label_->SetText(entry.value);
+ annotation_label_->SetText(entry.annotation);
}
void CandidateView::SetInfolistIcon(bool enable) {
« no previous file with comments | « no previous file | ash/ime/candidate_window_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698