summaryrefslogtreecommitdiffstats
path: root/app/text_elider.h
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 /app/text_elider.h
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 'app/text_elider.h')
-rw-r--r--app/text_elider.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/text_elider.h b/app/text_elider.h
index 8a5653d..36d12ae 100644
--- a/app/text_elider.h
+++ b/app/text_elider.h
@@ -32,10 +32,10 @@ namespace gfx {
// as an LTR string (using base::i18n::WrapStringWithLTRFormatting()) so that it
// is displayed properly in an RTL context. Please refer to
// http://crbug.com/6487 for more information.
-std::wstring ElideUrl(const GURL& url,
- const gfx::Font& font,
- int available_pixel_width,
- const std::wstring& languages);
+string16 ElideUrl(const GURL& url,
+ const gfx::Font& font,
+ int available_pixel_width,
+ const std::wstring& languages);
// Elides |text| to fit in |available_pixel_width|. If |elide_in_middle| is
// set the ellipsis is placed in the middle of the string; otherwise it is