ui/base/ime/input_method_chromeos.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/input_method_chromeos.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/input_method_chromeos.cc

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

index 13f9dbc6e6a397b701e32425443a65d401888521..61333310fb3c50b08985af0488d1f53776d2b1a1 100644

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

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

@@ -496,7 +496,8 @@ void InputMethodChromeOS::UpdateCompositionText(

chromeos::IBusPanelCandidateWindowHandlerInterface* candidate_window =

chromeos::IMEBridge::Get()->GetCandidateWindowHandler();

if (candidate_window)

- candidate_window->UpdatePreeditText(text.text(), cursor_pos, visible);

+ candidate_window->UpdatePreeditText(

+ base::UTF8ToUTF16(text.text()), cursor_pos, visible);

}

// |visible| argument is very confusing. For example, what's the correct

« no previous file with comments | « ui/base/ime/chromeos/mock_ime_candidate_window_handler.cc ('k') | no next file » | no next file with comments »