summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-27 21:47:48 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-27 21:47:48 +0000
commit25de8d0c1874566511d42d4e46276507bb88ce16 (patch)
treefda12f19796cd23765a87f4e1402e3758aa9ce9c /views
parentd1e7881403dd7f9fa28292beb38f0d6e01a7e3c0 (diff)
downloadchromium_src-25de8d0c1874566511d42d4e46276507bb88ce16.zip
chromium_src-25de8d0c1874566511d42d4e46276507bb88ce16.tar.gz
chromium_src-25de8d0c1874566511d42d4e46276507bb88ce16.tar.bz2
Convert ElideUrl to return a string16 instead of a wstring.
BUG=23581 Review URL: http://codereview.chromium.org/4115003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64156 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/controls/label.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/views/controls/label.cc b/views/controls/label.cc
index dcff7c8..9421444 100644
--- a/views/controls/label.cc
+++ b/views/controls/label.cc
@@ -423,7 +423,8 @@ void Label::CalculateDrawStringParams(std::wstring* paint_text,
if (url_set_) {
// TODO(jungshik) : Figure out how to get 'intl.accept_languages'
// preference and use it when calling ElideUrl.
- *paint_text = gfx::ElideUrl(url_, font_, width(), std::wstring());
+ *paint_text = UTF16ToWideHack(gfx::ElideUrl(url_, font_, width(),
+ std::wstring()));
// An URLs is always treated as an LTR text and therefore we should
// explicitly mark it as such if the locale is RTL so that URLs containing