ui/gfx/platform_font_gtk.cc - Issue 7739016: aura-views: Make views_aura_desktop compile and run on linux.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gfx/platform_font_gtk.cc

Issue 7739016: aura-views: Make views_aura_desktop compile and run on linux. (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:

Index: ui/gfx/platform_font_gtk.cc

diff --git a/ui/gfx/platform_font_gtk.cc b/ui/gfx/platform_font_gtk.cc

index 05e43fec76095421008ab60e409196df6db04ffb..dad26f753903706226ac531807e1a40871c26635 100644

--- a/ui/gfx/platform_font_gtk.cc

+++ b/ui/gfx/platform_font_gtk.cc

@@ -114,7 +114,7 @@ string16 FindBestMatchFontFamilyName(const char* family_name) {

}

std::string GetDefaultFont() {

-#if defined(USE_WAYLAND)

+#if defined(USE_WAYLAND) || defined(USE_AURA)

return "sans 10";

#else

GtkSettings* settings = gtk_settings_get_default();