diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 20:46:14 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 20:46:14 +0000 |
| commit | 13658c4b2835a3155efa6eb2c3c6ff8fef2b7fa5 (patch) | |
| tree | ada8d64cbd2fd12c7248cca648e47ebd63e6462a /printing/printed_document.cc | |
| parent | cd4857b64f3e3b10ebfa3f44c38af0dc7376d5bb (diff) | |
| download | chromium_src-13658c4b2835a3155efa6eb2c3c6ff8fef2b7fa5.zip chromium_src-13658c4b2835a3155efa6eb2c3c6ff8fef2b7fa5.tar.gz chromium_src-13658c4b2835a3155efa6eb2c3c6ff8fef2b7fa5.tar.bz2 | |
Change Font.GetStringWidth() to take string16 instead of wstring.
do a bunch of string fixes along the way.
BUG=none
TEST=trybots
Review URL: http://codereview.chromium.org/5985007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/printed_document.cc')
| -rw-r--r-- | printing/printed_document.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/printing/printed_document.cc b/printing/printed_document.cc index 2369618..5993b3d 100644 --- a/printing/printed_document.cc +++ b/printing/printed_document.cc @@ -184,7 +184,8 @@ void PrintedDocument::PrintHeaderFooter(gfx::NativeDrawingContext context, // May happen if document name or url is empty. return; } - const gfx::Size string_size(font.GetStringWidth(output), font.GetHeight()); + const gfx::Size string_size(font.GetStringWidth(WideToUTF16Hack(output)), + font.GetHeight()); gfx::Rect bounding; bounding.set_height(string_size.height()); const gfx::Rect& overlay_area( |