summaryrefslogtreecommitdiffstats
path: root/printing/printed_document.cc
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-21 22:02:55 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-21 22:02:55 +0000
commitd6b671d0968013c3205c50ebaf45f356e34a58c5 (patch)
tree52b215053c36e30e97de5ff97edb309700735ef0 /printing/printed_document.cc
parentc5af1c1af7e02b4998b085d29ecf8249f679e50a (diff)
downloadchromium_src-d6b671d0968013c3205c50ebaf45f356e34a58c5.zip
chromium_src-d6b671d0968013c3205c50ebaf45f356e34a58c5.tar.gz
chromium_src-d6b671d0968013c3205c50ebaf45f356e34a58c5.tar.bz2
Convert gfx::ElideText from using wstrings to string16.
BUG=23581 Review URL: http://codereview.chromium.org/3885003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63433 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/printed_document.cc')
-rw-r--r--printing/printed_document.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/printing/printed_document.cc b/printing/printed_document.cc
index 2dad1a0..04d8d3d 100644
--- a/printing/printed_document.cc
+++ b/printing/printed_document.cc
@@ -234,7 +234,8 @@ void PrintedDocument::PrintHeaderFooter(gfx::NativeDrawingContext context,
if (line == PageOverlays::kUrl) {
output = gfx::ElideUrl(url(), font, bounding.width(), std::wstring());
} else {
- output = gfx::ElideText(output, font, bounding.width(), false);
+ output = UTF16ToWideHack(gfx::ElideText(WideToUTF16Hack(output),
+ font, bounding.width(), false));
}
}