diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 15:16:04 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 15:16:04 +0000 |
| commit | b22558a183cefa554a1730188a51994504100351 (patch) | |
| tree | 1761e4f23e2e9060ff7bfa5a9026a4937d73e312 /gfx/font.h | |
| parent | 3f891cf79f72f4768a15bfae051e08b9211ed8c3 (diff) | |
| download | chromium_src-b22558a183cefa554a1730188a51994504100351.zip chromium_src-b22558a183cefa554a1730188a51994504100351.tar.gz chromium_src-b22558a183cefa554a1730188a51994504100351.tar.bz2 | |
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
Diffstat (limited to 'gfx/font.h')
| -rw-r--r-- | gfx/font.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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; |