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

Unified Diff: chrome/browser/chromeos/input_method/input_method_engine.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
Index: chrome/browser/chromeos/input_method/input_method_engine.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_engine.cc b/chrome/browser/chromeos/input_method/input_method_engine.cc
index 200e6816835f9b724cd01ebd4e7e64aa717214ba..0de05416f2f66abcdef40d0be7f6d1aa02e72b34 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine.cc
+++ b/chrome/browser/chromeos/input_method/input_method_engine.cc
@@ -315,11 +315,11 @@ bool InputMethodEngine::SetCandidates(
for (std::vector<Candidate>::const_iterator ix = candidates.begin();
ix != candidates.end(); ++ix) {
ui::CandidateWindow::Entry entry;
- entry.value = ix->value;
- entry.label = ix->label;
- entry.annotation = ix->annotation;
- entry.description_title = ix->usage.title;
- entry.description_body = ix->usage.body;
+ entry.value = base::UTF8ToUTF16(ix->value);
+ entry.label = base::UTF8ToUTF16(ix->label);
+ entry.annotation = base::UTF8ToUTF16(ix->annotation);
+ entry.description_title = base::UTF8ToUTF16(ix->usage.title);
+ entry.description_body = base::UTF8ToUTF16(ix->usage.body);
// Store a mapping from the user defined ID to the candidate index.
candidate_indexes_[ix->id] = candidate_ids_.size();

Powered by Google App Engine
This is Rietveld 408576698