| Index: gfx/font.h
 | 
| ===================================================================
 | 
| --- gfx/font.h	(revision 71043)
 | 
| +++ gfx/font.h	(working copy)
 | 
| @@ -43,7 +43,7 @@
 | 
|    explicit Font(PlatformFont* platform_font);
 | 
|  
 | 
|    // Creates a font with the specified name and size.
 | 
| -  Font(const std::wstring& font_name, int font_size);
 | 
| +  Font(const string16& font_name, int font_size);
 | 
|  
 | 
|    ~Font();
 | 
|  
 | 
| @@ -85,7 +85,7 @@
 | 
|    int GetStyle() const;
 | 
|  
 | 
|    // Returns the font name.
 | 
| -  const std::wstring& GetFontName() const;
 | 
| +  const string16& GetFontName() const;
 | 
|  
 | 
|    // Returns the font size in pixels.
 | 
|    int GetFontSize() const;
 | 
| 
 |