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

Unified Diff: views/controls/label.cc

Issue 3108027: Convert GetDisplayStringInLTRDirectionality from wstring to string16. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 4 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
Index: views/controls/label.cc
diff --git a/views/controls/label.cc b/views/controls/label.cc
index 7953d183a12f4c7051fb93e2495365658f9149a8..c4f8b227030050b11bbd1c312932be141c8b9c7b 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 {
« chrome/browser/tab_contents/tab_contents.cc ('K') | « chrome/browser/views/status_bubble_views.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698