ui/base/resource/resource_bundle.cc - Issue 400793002: Makes embedded content shell build without pango

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/base/resource/resource_bundle.cc

Issue 400793002: Makes embedded content shell build without pango (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 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/base/resource/resource_bundle.cc

diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc

index b2be5e460c2a7eff2d0acf2f90bb3e6cef5d4555..22b4ff34189b62bbe15410fd1cc190817ccffe47 100644

--- a/ui/base/resource/resource_bundle.cc

+++ b/ui/base/resource/resource_bundle.cc

@@ -68,7 +68,7 @@ const unsigned char kPngDataChunkType[4] = { 'I', 'D', 'A', 'T' };

ResourceBundle* g_shared_instance_ = NULL;

void InitDefaultFontList() {

-#if defined(OS_CHROMEOS)

+#if defined(OS_CHROMEOS) && (!defined(USE_OZONE) || defined(USE_PANGO))

spang 2014/07/17 18:53:44 you don't need the ozone part. Just #if defined(

varkha 2014/07/17 18:57:48 Done.

ResourceBundle& rb = ResourceBundle::GetSharedInstance();

std::string font_family = base::UTF16ToUTF8(

rb.GetLocalizedString(IDS_UI_FONT_FAMILY_CROS));

« no previous file with comments | « no previous file | no next file » | no next file with comments »