diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 16:23:18 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 16:23:18 +0000 |
| commit | 70edb8606702fd26565cc46fd3075bfe75f68d97 (patch) | |
| tree | c2647cc5cd843c5abbc9c90bd6855bd8b0b7c674 /views | |
| parent | 05672cafff847dc3beb0e29e1506bee6a5a7447e (diff) | |
| download | chromium_src-70edb8606702fd26565cc46fd3075bfe75f68d97.zip chromium_src-70edb8606702fd26565cc46fd3075bfe75f68d97.tar.gz chromium_src-70edb8606702fd26565cc46fd3075bfe75f68d97.tar.bz2 | |
Convert GetDisplayStringInLTRDirectionality from wstring to string16.
BUG=23581
Review URL: http://codereview.chromium.org/3108027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/label.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/views/controls/label.cc b/views/controls/label.cc index 7953d18..c4f8b22 100644 --- a/views/controls/label.cc +++ b/views/controls/label.cc @@ -439,7 +439,8 @@ void Label::CalculateDrawStringParams(std::wstring* paint_text, // characters. We use the locale settings because an URL is always treated // as an LTR string, even if its containing view does not use an RTL UI // layout. - base::i18n::GetDisplayStringInLTRDirectionality(paint_text); + *paint_text = UTF16ToWide(base::i18n::GetDisplayStringInLTRDirectionality( + WideToUTF16(*paint_text))); } else if (elide_in_middle_) { *paint_text = gfx::ElideText(text_, font_, width(), true); } else { |