diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 00:21:22 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 00:21:22 +0000 |
| commit | a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5 (patch) | |
| tree | 2cb114cfcd3d89203d045c56ec2af4d2d52cf9b0 /ui/gfx/pango_util.cc | |
| parent | b09be0a7dace2e86516a2661c9c504d640abed7c (diff) | |
| download | chromium_src-a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5.zip chromium_src-a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5.tar.gz chromium_src-a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5.tar.bz2 | |
Remove TOOLKIT_USES_GTK and consolidate it into TOOLKIT_GTK
Add gtk dependency to base.gyp for android host_os="linux" case
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9969080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/pango_util.cc')
| -rw-r--r-- | ui/gfx/pango_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gfx/pango_util.cc b/ui/gfx/pango_util.cc index 301b3cb..b051729 100644 --- a/ui/gfx/pango_util.cc +++ b/ui/gfx/pango_util.cc @@ -20,7 +20,7 @@ #include "ui/gfx/platform_font_pango.h" #include "ui/gfx/rect.h" -#if !defined(USE_WAYLAND) && defined(TOOLKIT_USES_GTK) +#if !defined(USE_WAYLAND) && defined(TOOLKIT_GTK) #include <gdk/gdk.h> #include <gtk/gtk.h> #include "ui/gfx/gtk_util.h" @@ -50,7 +50,7 @@ cairo_font_options_t* GetCairoFontOptions() { cairo_font_options = cairo_font_options_create(); -#if defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_GTK) gint antialias = 0; gint hinting = 0; gchar* hint_style = NULL; |