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

Unified Diff: ui/gfx/platform_font_pango.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/pango_util.cc ('k') | ui/gfx/rect.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/platform_font_pango.cc
diff --git a/ui/gfx/platform_font_pango.cc b/ui/gfx/platform_font_pango.cc
index b09819e566ffa77beadf31740100f411f12cc325..fe4d4e68a6668fd6f61ea8482a56e357a42f44d1 100644
--- a/ui/gfx/platform_font_pango.cc
+++ b/ui/gfx/platform_font_pango.cc
@@ -22,7 +22,7 @@
#include "ui/gfx/font.h"
#include "ui/gfx/pango_util.h"
-#if !defined(USE_WAYLAND) && defined(TOOLKIT_GTK)
+#if defined(TOOLKIT_GTK)
#include <gdk/gdk.h>
#include <gtk/gtk.h>
#endif
@@ -63,7 +63,7 @@ std::string FindBestMatchFontFamilyName(
// Returns a Pango font description (suitable for parsing by
// pango_font_description_from_string()) for the default UI font.
std::string GetDefaultFont() {
-#if defined(USE_WAYLAND) || !defined(TOOLKIT_GTK)
+#if !defined(TOOLKIT_GTK)
#if defined(OS_CHROMEOS)
return l10n_util::GetStringUTF8(IDS_UI_FONT_FAMILY_CROS);
#else
@@ -82,7 +82,7 @@ std::string GetDefaultFont() {
std::string default_font = std::string(font_name);
g_free(font_name);
return default_font;
-#endif // defined(USE_WAYLAND) || !defined(TOOLKIT_GTK)
+#endif // !defined(TOOLKIT_GTK)
}
} // namespace
« no previous file with comments | « ui/gfx/pango_util.cc ('k') | ui/gfx/rect.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698