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/font.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gfx/font.h') diff --git a/gfx/font.h b/gfx/font.h index eb6e4d5..d0b16a4 100644 --- a/gfx/font.h +++ b/gfx/font.h @@ -43,7 +43,7 @@ class Font { explicit Font(PlatformFont* platform_font); // Creates a font with the specified name and size. - Font(const string16& font_name, int font_size); + Font(const std::wstring& font_name, int font_size); ~Font(); @@ -85,7 +85,7 @@ class Font { int GetStyle() const; // Returns the font name. - string16 GetFontName() const; + const std::wstring& GetFontName() const; // Returns the font size in pixels. int GetFontSize() const; -- cgit v1.1