| Index: gfx/canvas_skia_mac.mm
|
| diff --git a/gfx/canvas_skia_mac.mm b/gfx/canvas_skia_mac.mm
|
| index 547a5e4848637875d2e4056f26c6f608b097e2ab..1c3dccaa5b7b54f79340034b5b57551749c8a8b8 100644
|
| --- a/gfx/canvas_skia_mac.mm
|
| +++ b/gfx/canvas_skia_mac.mm
|
| @@ -25,12 +25,12 @@ CanvasSkia::~CanvasSkia() {
|
| }
|
|
|
| // static
|
| -void CanvasSkia::SizeStringInt(const std::wstring& text,
|
| +void CanvasSkia::SizeStringInt(const string16& text,
|
| const gfx::Font& font,
|
| int* width, int* height,
|
| int flags) {
|
| NSFont* native_font = font.GetNativeFont();
|
| - NSString* ns_string = base::SysWideToNSString(text);
|
| + NSString* ns_string = base::SysUTF16ToNSString(text);
|
| NSDictionary* attributes =
|
| [NSDictionary dictionaryWithObject:native_font
|
| forKey:NSFontAttributeName];
|
|
|