summaryrefslogtreecommitdiffstats
path: root/views/controls/label.cc
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-08 00:49:16 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-08 00:49:16 +0000
commit7f23bac00f99429e34198b12322c11de3097e0ae (patch)
treed6d5994d06ed4aaa1b11aa3bcaf55ebaa2fdcaa8 /views/controls/label.cc
parentb852b07bce576b50aae75cbdc6ebf8c53d226c7f (diff)
downloadchromium_src-7f23bac00f99429e34198b12322c11de3097e0ae.zip
chromium_src-7f23bac00f99429e34198b12322c11de3097e0ae.tar.gz
chromium_src-7f23bac00f99429e34198b12322c11de3097e0ae.tar.bz2
Remove wstrings from ui/base/text_elider.h functions.
The last param is for languages, which is already a std::string in most places. BUG=23581 Review URL: http://codereview.chromium.org/6627061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77219 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/label.cc')
-rw-r--r--views/controls/label.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/views/controls/label.cc b/views/controls/label.cc
index 810769a..5bc1a2a 100644
--- a/views/controls/label.cc
+++ b/views/controls/label.cc
@@ -439,7 +439,7 @@ void Label::CalculateDrawStringParams(std::wstring* paint_text,
// TODO(jungshik) : Figure out how to get 'intl.accept_languages'
// preference and use it when calling ElideUrl.
*paint_text = UTF16ToWideHack(
- ui::ElideUrl(url_, font_, GetAvailableRect().width(), std::wstring()));
+ ui::ElideUrl(url_, font_, GetAvailableRect().width(), std::string()));
// 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