Change string16 to std::string in the gfx::Font() interface.

Most consumers on all platforms (including windows!) were converting the font family/GetFontName() result to UTF8. (Windows was still having to convert for the SkTypeface calls.) On Linux, we're performing a UTF16ToUTF8 on each string print (and this is showing up in pprof output.)

BUG=100803
TEST=none


Review URL: http://codereview.chromium.org/8392017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107659 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 5 deletions

diff --git a/ui/gfx/platform_font.h b/ui/gfx/platform_font.h
index 7e316fe..bd4e0ae 100644
--- a/ui/gfx/platform_font.h
+++ b/ui/gfx/platform_font.h
@@ -23,9 +23,9 @@ class UI_EXPORT PlatformFont : public base::RefCounted<PlatformFont> {
   static PlatformFont* CreateDefault();
   static PlatformFont* CreateFromFont(const Font& other);
   static PlatformFont* CreateFromNativeFont(NativeFont native_font);
-  // Creates a PlatformFont implementation with the specified |font_name| and
-  // |font_size| in pixels.
-  static PlatformFont* CreateFromNameAndSize(const string16& font_name,
+  // Creates a PlatformFont implementation with the specified |font_name|
+  // (encoded in UTF-8) and |font_size| in pixels.
+  static PlatformFont* CreateFromNameAndSize(const std::string& font_name,
                                              int font_size);
 
   // Returns a new Font derived from the existing font.
@@ -59,8 +59,8 @@ class UI_EXPORT PlatformFont : public base::RefCounted<PlatformFont> {
   // Returns the style of the font.
   virtual int GetStyle() const = 0;
 
-  // Returns the font name.
-  virtual string16 GetFontName() const = 0;
+  // Returns the font name in UTF-8.
+  virtual std::string GetFontName() const = 0;
 
   // Returns the font size in pixels.
   virtual int GetFontSize() const = 0;