diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 18:49:33 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 18:49:33 +0000 |
| commit | 1fe96d0176a2014e38af43154cd27cbf64cf99bc (patch) | |
| tree | dde084bd7272b178765fae9eb3097910d2b1f9b5 /chrome/browser/chromeos/input_method/candidate_window_view.cc | |
| parent | 28126586a68d2aaed9557c505e10ebc20f50ed5b (diff) | |
| download | chromium_src-1fe96d0176a2014e38af43154cd27cbf64cf99bc.zip chromium_src-1fe96d0176a2014e38af43154cd27cbf64cf99bc.tar.gz chromium_src-1fe96d0176a2014e38af43154cd27cbf64cf99bc.tar.bz2 | |
Update some uses of UTF conversions in chrome/browser to use the base:: namespace.
BUG=330556
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/120943002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/input_method/candidate_window_view.cc')
| -rw-r--r-- | chrome/browser/chromeos/input_method/candidate_window_view.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/input_method/candidate_window_view.cc b/chrome/browser/chromeos/input_method/candidate_window_view.cc index f2423f7..7efcdd5 100644 --- a/chrome/browser/chromeos/input_method/candidate_window_view.cc +++ b/chrome/browser/chromeos/input_method/candidate_window_view.cc @@ -75,12 +75,12 @@ views::View* WrapWithPadding(views::View* view, const gfx::Insets& insets) { base::string16 CreateShortcutText(size_t index, const CandidateWindow& candidate_window) { if (index >= candidate_window.candidates().size()) - return UTF8ToUTF16(""); + return base::string16(); std::string shortcut_text = candidate_window.candidates()[index].label; if (!shortcut_text.empty() && candidate_window.orientation() != CandidateWindow::VERTICAL) shortcut_text += '.'; - return UTF8ToUTF16(shortcut_text); + return base::UTF8ToUTF16(shortcut_text); } // Creates the shortcut label, and returns it (never returns NULL). @@ -245,7 +245,7 @@ gfx::Size ComputeCandidateColumnSize( const size_t index = start_from + i; candidate_label->SetText( - UTF8ToUTF16(candidate_window.candidates()[index].value)); + base::UTF8ToUTF16(candidate_window.candidates()[index].value)); gfx::Size text_size = candidate_label->GetPreferredSize(); candidate_column_width = std::max(candidate_column_width, text_size.width()); @@ -279,7 +279,7 @@ gfx::Size ComputeAnnotationColumnSize( const size_t index = start_from + i; annotation_label->SetText( - UTF8ToUTF16(candidate_window.candidates()[index].annotation)); + base::UTF8ToUTF16(candidate_window.candidates()[index].annotation)); gfx::Size text_size = annotation_label->GetPreferredSize(); annotation_column_width = std::max(annotation_column_width, text_size.width()); @@ -318,7 +318,7 @@ class InformationTextArea : public HidableArea { // Set the displayed text. void SetText(const std::string& utf8_text) { - label_->SetText(UTF8ToUTF16(utf8_text)); + label_->SetText(base::UTF8ToUTF16(utf8_text)); } protected: @@ -745,8 +745,8 @@ void CandidateWindowView::UpdateCandidates( if (candidate_index < new_candidate_window.candidates().size()) { const CandidateWindow::Entry& entry = new_candidate_window.candidates()[candidate_index]; - candidate_view->SetCandidateText(UTF8ToUTF16(entry.value)); - candidate_view->SetAnnotationText(UTF8ToUTF16(entry.annotation)); + candidate_view->SetCandidateText(base::UTF8ToUTF16(entry.value)); + candidate_view->SetAnnotationText(base::UTF8ToUTF16(entry.annotation)); candidate_view->SetRowEnabled(true); candidate_view->SetInfolistIcon(!entry.description_title.empty()); } else { |