diff options
| author | uekawa@chromium.org <uekawa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 15:51:06 +0000 |
|---|---|---|
| committer | uekawa@chromium.org <uekawa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 15:51:06 +0000 |
| commit | 269305943d476666de052881029a481577f0145e (patch) | |
| tree | 442291a0acb42d71431c1fb8125519a7d1a215fe /ash/ime/candidate_view.cc | |
| parent | 5f38661ebabcd5329cd9d36c8fd146254abc1529 (diff) | |
| download | chromium_src-269305943d476666de052881029a481577f0145e.zip chromium_src-269305943d476666de052881029a481577f0145e.tar.gz chromium_src-269305943d476666de052881029a481577f0145e.tar.bz2 | |
Migrate CandidateWindow::Entry to string16.
BUG=329604
Review URL: https://codereview.chromium.org/162723003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ime/candidate_view.cc')
| -rw-r--r-- | ash/ime/candidate_view.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ash/ime/candidate_view.cc b/ash/ime/candidate_view.cc index 82c90092..83c930f 100644 --- a/ash/ime/candidate_view.cc +++ b/ash/ime/candidate_view.cc @@ -174,12 +174,12 @@ void CandidateView::SetWidths(int shortcut_width, int candidate_width) { } void CandidateView::SetEntry(const ui::CandidateWindow::Entry& entry) { - std::string label = entry.label; + base::string16 label = entry.label; if (!label.empty() && orientation_ != ui::CandidateWindow::VERTICAL) - label += '.'; - shortcut_label_->SetText(base::UTF8ToUTF16(label)); - candidate_label_->SetText(base::UTF8ToUTF16(entry.value)); - annotation_label_->SetText(base::UTF8ToUTF16(entry.annotation)); + label += base::ASCIIToUTF16("."); + shortcut_label_->SetText(label); + candidate_label_->SetText(entry.value); + annotation_label_->SetText(entry.annotation); } void CandidateView::SetInfolistIcon(bool enable) { |