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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/pango_util.cc

Issue 13985039: Rationalize linux vs x11 in ui (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix review / try issues Created 7 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/base/resource/resource_bundle_aurax11.cc ('k') | ui/gl/gl.gyp » ('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 612cd631102098de3c4b0ce012061c211a65fcaa..2fff6b10d611fa221135ed31ab2df97648497f5a 100644
--- a/ui/gfx/pango_util.cc
+++ b/ui/gfx/pango_util.cc
@@ -123,11 +123,11 @@ float GetPixelsInPoint() {
} // namespace
PangoContext* GetPangoContext() {
-#if defined(USE_AURA)
+#if defined(TOOLKIT_GTK)
+ return gdk_pango_context_get();
+#else
PangoFontMap* font_map = pango_cairo_font_map_get_default();
return pango_font_map_create_context(font_map);
-#else
- return gdk_pango_context_get();
#endif
}
« no previous file with comments | « ui/base/resource/resource_bundle_aurax11.cc ('k') | ui/gl/gl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698