Unify desktop Linux and Chrome OS font rendering params.

chrome/browser/ui/libgtk2ui/gtk2_ui.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_
 #define CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_
 
 #include <map>
 #include <vector>
 
 #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"
 #include "chrome/browser/ui/libgtk2ui/libgtk2ui_export.h"
 #include "chrome/browser/ui/libgtk2ui/owned_widget_gtk2.h"
 #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/views/linux_ui/linux_ui.h"
 #include "ui/views/window/frame_buttons.h"
 
 typedef struct _GdkColor GdkColor;
 typedef struct _GtkBorder GtkBorder;
 typedef struct _GtkStyle GtkStyle;
 typedef struct _GtkWidget GtkWidget;
 
 class SkBitmap;
 
 namespace gfx {
 class Image;
+class ScopedPangoFontDescription;
 }
 
 namespace libgtk2ui {
 class Gtk2Border;
 class Gtk2KeyBindingsHandler;
 class Gtk2SignalRegistrar;
 class GConfListener;
 
 // Interface to GTK2 desktop features.
 //
@@ skipping 16 matching lines @@
                                bool focused,
                                bool call_to_action,
                                int width,
                                int height) const;
 
   // ui::LinuxInputMethodContextFactory:
   virtual scoped_ptr<ui::LinuxInputMethodContext> CreateInputMethodContext(
       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:
   virtual ui::SelectFileDialog* CreateSelectFileDialog(
       ui::SelectFileDialog::Listener* listener,
       ui::SelectFilePolicy* policy) const OVERRIDE;
 
   // ui::LinuxUI:
   virtual void Initialize() OVERRIDE;
   virtual gfx::Image GetThemeImageNamed(int id) const OVERRIDE;
@@ skipping 137 matching lines @@
   SkColor focus_ring_color_;
   SkColor thumb_active_color_;
   SkColor thumb_inactive_color_;
   SkColor track_color_;
   SkColor active_selection_bg_color_;
   SkColor active_selection_fg_color_;
   SkColor inactive_selection_bg_color_;
   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
   // change if we ever have to support XFCE's configuration system or KDE's.
   scoped_ptr<GConfListener> gconf_listener_;
 #endif  // defined(USE_GCONF)
 
   // If either of these vectors are non-empty, they represent the current
   // window button configuration.
   std::vector<views::FrameButton> leading_buttons_;
@@ skipping 22 matching lines @@
 }  // namespace libgtk2ui
 
 // Access point to the GTK2 desktop system. This should be the only symbol that
 // is exported in the library; everything else should be used through the
 // interface, because eventually this .so will be loaded through dlopen at
 // runtime so our main binary can conditionally load GTK2 or GTK3 or EFL or
 // QT or whatever.
 LIBGTK2UI_EXPORT views::LinuxUI* BuildGtk2UI();
 
 #endif  // CHROME_BROWSER_UI_LIBGTK2UI_GTK2_UI_H_