diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-29 18:13:12 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-29 18:13:12 +0000 |
| commit | 2fa2f2d8bcd5f8fa812723c442bb54f2328ad93e (patch) | |
| tree | bbadbc7c214c5d8adda40904607090f24e70b490 /ui/gfx | |
| parent | 40a7e41b4820be63de44ece14c70b3bfe7e4c564 (diff) | |
| download | chromium_src-2fa2f2d8bcd5f8fa812723c442bb54f2328ad93e.zip chromium_src-2fa2f2d8bcd5f8fa812723c442bb54f2328ad93e.tar.gz chromium_src-2fa2f2d8bcd5f8fa812723c442bb54f2328ad93e.tar.bz2 | |
Rationalize linux vs x11 in ui
BUG=236170
TEST=None
R=ben@chromium.org
Review URL: https://codereview.chromium.org/13985039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx')
| -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 612cd63..2fff6b10 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 } |