Unify desktop Linux and Chrome OS font rendering params.

chrome/browser/ui/libgtk2ui/gtk2_ui.h

Index: chrome/browser/ui/libgtk2ui/gtk2_ui.h
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.h b/chrome/browser/ui/libgtk2ui/gtk2_ui.h
index a750b11e1bedf44329d6d8ec2c924528c421b210..2a16c733cbc7002fe81dfb7d1d8e9984044a6118 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_ui.h
+++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.h
@@ -10,6 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/ui/libgtk2ui/gtk2_signal.h"
 #include "chrome/browser/ui/libgtk2ui/gtk2_signal_registrar.h"
@@ -29,6 +30,7 @@ class SkBitmap;
 
 namespace gfx {
 class Image;
+class ScopedPangoFontDescription;
 }
 
 namespace libgtk2ui {
@@ -65,11 +67,9 @@ class Gtk2UI : public views::LinuxUI {
       ui::LinuxInputMethodContextDelegate* delegate) const OVERRIDE;
 
   // gfx::LinuxFontDelegate:
-  virtual bool UseAntialiasing() const OVERRIDE;
-  virtual gfx::FontRenderParams::Hinting GetHintingStyle() const OVERRIDE;
-  virtual gfx::FontRenderParams::SubpixelRendering
-      GetSubpixelRenderingStyle() const OVERRIDE;
-  virtual std::string GetDefaultFontDescription() const OVERRIDE;
+  virtual gfx::FontRenderParams GetDefaultFontRenderParams() const OVERRIDE;
+  virtual scoped_ptr<gfx::ScopedPangoFontDescription>
+      GetDefaultPangoFontDescription() const OVERRIDE;
   virtual double GetFontDPI() const OVERRIDE;
 
   // ui::LinuxShellDialog:
@@ -227,7 +227,7 @@ class Gtk2UI : public views::LinuxUI {
   SkColor inactive_selection_fg_color_;
 
   // Pango description for the default UI font.
-  std::string default_font_description_;
+  scoped_ptr<gfx::ScopedPangoFontDescription> default_font_description_;
 
 #if defined(USE_GCONF)
   // Currently, the only source of window button configuration. This will