Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(340)

Unified Diff: ui/gfx/pango_util.cc

Issue 7977025: aura: Make 'ui' buildable without gtk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/native_widget_types.h ('k') | ui/gfx/platform_font_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/pango_util.cc
diff --git a/ui/gfx/pango_util.cc b/ui/gfx/pango_util.cc
index 16186fb6f303381ac2fb1bbeace87858b7ff4747..1d67b202f7f22ac68d49d7d5840ac9e3d9d4d0a4 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,
« no previous file with comments | « ui/gfx/native_widget_types.h ('k') | ui/gfx/platform_font_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698