Index: ui/gfx/font.h |
diff --git a/ui/gfx/font.h b/ui/gfx/font.h |
index cdb9542e85dcfc26635442dbef3d6edb92ae83be..22d0698e958d67f4a9196244522b4ff5c6b3955e 100644 |
--- a/ui/gfx/font.h |
+++ b/ui/gfx/font.h |
@@ -44,7 +44,7 @@ class UI_EXPORT Font { |
explicit Font(PlatformFont* platform_font); |
// Creates a font with the specified name and size in pixels. |
Avi (use Gerrit)
2011/10/27 20:54:17
Specify UTF-8 encoding for font names?
|
- Font(const string16& font_name, int font_size); |
+ Font(const std::string& font_name, int font_size); |
~Font(); |
@@ -86,7 +86,7 @@ class UI_EXPORT Font { |
int GetStyle() const; |
// Returns the font name. |
- string16 GetFontName() const; |
+ std::string GetFontName() const; |
// Returns the font size in pixels. |
int GetFontSize() const; |