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

Unified Diff: ash/ime/candidate_window_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 | « ash/ime/candidate_window_view.h ('k') | ash/ime/candidate_window_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ime/candidate_window_view.cc
diff --git a/ash/ime/candidate_window_view.cc b/ash/ime/candidate_window_view.cc
index 8865e6453cfb75e29e78e9d646faaa1fd6512495..ec158accef633ae05c83588e9ec1d04436029a4a 100644
--- a/ash/ime/candidate_window_view.cc
+++ b/ash/ime/candidate_window_view.cc
@@ -114,8 +114,8 @@ class InformationTextArea : public views::View {
}
// Sets the displayed text.
- void SetText(const std::string& utf8_text) {
- label_->SetText(base::UTF8ToUTF16(utf8_text));
+ void SetText(const base::string16& text) {
+ label_->SetText(text);
}
// Sets the border thickness for top/bottom.
@@ -225,8 +225,8 @@ void CandidateWindowView::ShowPreeditText() {
UpdateVisibility();
}
-void CandidateWindowView::UpdatePreeditText(const std::string& utf8_text) {
- preedit_->SetText(utf8_text);
+void CandidateWindowView::UpdatePreeditText(const base::string16& text) {
+ preedit_->SetText(text);
}
void CandidateWindowView::ShowLookupTable() {
@@ -335,7 +335,8 @@ void CandidateWindowView::UpdateCandidates(
// Updates auxiliary text
auxiliary_text_->SetVisible(candidate_window_.is_auxiliary_text_visible());
- auxiliary_text_->SetText(candidate_window_.auxiliary_text());
+ auxiliary_text_->SetText(base::UTF8ToUTF16(
+ candidate_window_.auxiliary_text()));
}
void CandidateWindowView::SetCursorBounds(const gfx::Rect& cursor_bounds,
« no previous file with comments | « ash/ime/candidate_window_view.h ('k') | ash/ime/candidate_window_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698