diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 17:52:54 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 17:52:54 +0000 |
| commit | b6bb36e2e8c9a09b4fd733bf74b60a6f02a5a7e9 (patch) | |
| tree | 91131329313e02e6c171e007707ab1cb0c3c2be0 /ui/gfx/pango_util.cc | |
| parent | 694cafac21aee4a18638d5dfb0e726d3f237be3d (diff) | |
| download | chromium_src-b6bb36e2e8c9a09b4fd733bf74b60a6f02a5a7e9.zip chromium_src-b6bb36e2e8c9a09b4fd733bf74b60a6f02a5a7e9.tar.gz chromium_src-b6bb36e2e8c9a09b4fd733bf74b60a6f02a5a7e9.tar.bz2 | |
aura: Make 'ui' buildable without gtk.
BUG=97131
TEST=ui_unittests links and runs with use_aura=1
Review URL: http://codereview.chromium.org/7977025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102131 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/pango_util.cc')
| -rw-r--r-- | ui/gfx/pango_util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gfx/pango_util.cc b/ui/gfx/pango_util.cc index 16186fb..1d67b20 100644 --- a/ui/gfx/pango_util.cc +++ b/ui/gfx/pango_util.cc @@ -5,7 +5,6 @@ #include "ui/gfx/pango_util.h" #include <cairo/cairo.h> -#include <gtk/gtk.h> #include <pango/pango.h> #include <pango/pangocairo.h> @@ -14,7 +13,8 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" -#if !defined(USE_WAYLAND) +#if !defined(USE_WAYLAND) && defined(TOOLKIT_USES_GTK) +#include <gtk/gtk.h> #include "ui/gfx/gtk_util.h" #else #include "ui/gfx/linux_util.h" @@ -43,7 +43,7 @@ cairo_font_options_t* GetCairoFontOptions() { gchar* hint_style = NULL; gchar* rgba_style = NULL; -#if !defined(USE_WAYLAND) && !defined(USE_AURA) +#if !defined(USE_WAYLAND) && defined(TOOLKIT_USES_GTK) // TODO(xji): still has gtk dependency. GtkSettings* gtk_settings = gtk_settings_get_default(); g_object_get(gtk_settings, |