chrome/browser/chromeos/input_method/candidate_window_controller_impl.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: chrome/browser/chromeos/input_method/candidate_window_controller_impl.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 | « chrome/browser/chromeos/input_method/candidate_window_controller_impl.h ('k') | chrome/browser/chromeos/input_method/input_method_engine.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc

diff --git a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc

index 58bc6cad8dd158fa79ea70abbe8d764845f88a50..f2721a9bb974eff3a50de90b87dae4a629800c65 100644

--- a/chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc

+++ b/chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc

@@ -152,16 +152,16 @@ void CandidateWindowControllerImpl::UpdateLookupTable(

}

void CandidateWindowControllerImpl::UpdatePreeditText(

- const std::string& utf8_text, unsigned int cursor, bool visible) {

+ const base::string16& text, unsigned int cursor, bool visible) {

// If it's not visible, hide the preedit text and return.

- if (!visible || utf8_text.empty()) {

+ if (!visible || text.empty()) {

if (candidate_window_view_)

candidate_window_view_->HidePreeditText();

return;

}

if (!candidate_window_view_)

InitCandidateWindowView();

- candidate_window_view_->UpdatePreeditText(utf8_text);

+ candidate_window_view_->UpdatePreeditText(text);

candidate_window_view_->ShowPreeditText();

}