ui/base/ime/candidate_window.cc - Issue 162723003: Migrate CandidateWindow::Entry to string16.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/base/ime/candidate_window.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:

Index: ui/base/ime/candidate_window.cc

diff --git a/ui/base/ime/candidate_window.cc b/ui/base/ime/candidate_window.cc

index f49613ba744bcbc09ee41685ce0c6c08042cd5cd..6cb32e2d77f18ee915a87f1069a045a48d4f4fec 100644

--- a/ui/base/ime/candidate_window.cc

+++ b/ui/base/ime/candidate_window.cc

@@ -70,8 +70,8 @@ void CandidateWindow::GetInfolistEntries(

candidate_entry.description_body.empty())

continue;

- InfolistEntry entry(base::UTF8ToUTF16(candidate_entry.description_title),

- base::UTF8ToUTF16(candidate_entry.description_body));

+ InfolistEntry entry(candidate_entry.description_title,

+ candidate_entry.description_body);

if (i == cursor_index_in_page) {

entry.highlighted = true;

*has_highlighted = true;

« no previous file with comments | « ui/base/ime/candidate_window.h ('k') | ui/base/ime/candidate_window_unittest.cc » ('j') | no next file with comments »