diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-22 18:15:25 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-22 18:15:25 +0000 |
| commit | 36f1e277205d0bc6621866b1242ea7ee00166d4a (patch) | |
| tree | 9d9fa8d67e2c2a4d5be66a99a04aa45d6fa9b58a /gfx/canvas_skia.h | |
| parent | 27a64faaaa8a1d23826794a5763d34cac5fbf9fe (diff) | |
| download | chromium_src-36f1e277205d0bc6621866b1242ea7ee00166d4a.zip chromium_src-36f1e277205d0bc6621866b1242ea7ee00166d4a.tar.gz chromium_src-36f1e277205d0bc6621866b1242ea7ee00166d4a.tar.bz2 | |
Convert SizeStringInt from taking a wstring to a string16.
BUG=23581
Review URL: http://codereview.chromium.org/5158006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66973 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx/canvas_skia.h')
| -rw-r--r-- | gfx/canvas_skia.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gfx/canvas_skia.h b/gfx/canvas_skia.h index d309784..153e812 100644 --- a/gfx/canvas_skia.h +++ b/gfx/canvas_skia.h @@ -7,6 +7,7 @@ #pragma once #include "base/basictypes.h" +#include "base/string16.h" #include "gfx/canvas.h" #include "skia/ext/platform_canvas.h" @@ -48,7 +49,7 @@ class CanvasSkia : public skia::PlatformCanvas, // Attempts to fit the text with the provided width and height. Increases // height and then width as needed to make the text fit. This method // supports multiple lines. - static void SizeStringInt(const std::wstring& text, + static void SizeStringInt(const string16& text, const gfx::Font& font, int* width, int* height, int flags); |