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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/pango_util.cc

Issue 10009024: Remove WAYLAND port (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years, 8 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_pango.cc » ('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 b051729cce1aeaf225ec5bfa3c3ccfb7fbd99443..e835602e689fd90111c1eacc88ee4261dff6825d 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_GTK)
+#if defined(TOOLKIT_GTK)
#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include "ui/gfx/gtk_util.h"
@@ -179,7 +179,7 @@ float GetPixelsInPoint() {
namespace gfx {
PangoContext* GetPangoContext() {
-#if defined(USE_WAYLAND) || defined(USE_AURA)
+#if defined(USE_AURA)
PangoFontMap* font_map = pango_cairo_font_map_get_default();
return pango_font_map_create_context(font_map);
#else
« no previous file with comments | « ui/gfx/native_widget_types.h ('k') | ui/gfx/platform_font_pango.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698