From b22558a183cefa554a1730188a51994504100351 Mon Sep 17 00:00:00 2001 From: "joi@chromium.org" Date: Wed, 12 Jan 2011 15:16:04 +0000 Subject: Revert 71167 - Remove wstring from gfx. BUG=68882 TEST=no visible changes; all tests pass Review URL: http://codereview.chromium.org/6121004 TBR=avi@chromium.org Review URL: http://codereview.chromium.org/6134010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71169 0039d316-1c4b-4281-b951-d872f2087c98 --- gfx/canvas_direct2d.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gfx/canvas_direct2d.h') diff --git a/gfx/canvas_direct2d.h b/gfx/canvas_direct2d.h index 740a24d..89ea448 100644 --- a/gfx/canvas_direct2d.h +++ b/gfx/canvas_direct2d.h @@ -57,15 +57,15 @@ class CanvasDirect2D : public Canvas { int dest_x, int dest_y, int dest_w, int dest_h, bool filter, const SkPaint& paint); - virtual void DrawStringInt(const string16& text, + virtual void DrawStringInt(const std::wstring& text, const gfx::Font& font, const SkColor& color, int x, int y, int w, int h); - virtual void DrawStringInt(const string16& text, + virtual void DrawStringInt(const std::wstring& text, const gfx::Font& font, const SkColor& color, const gfx::Rect& display_rect); - virtual void DrawStringInt(const string16& text, + virtual void DrawStringInt(const std::wstring& text, const gfx::Font& font, const SkColor& color, int x, int y, int w, int h, -- cgit v1.1