Commit 91e273a1 authored by varkha@chromium.org's avatar varkha@chromium.org

Makes embedded content shell build without pango

BUG=178543
TEST=build embedded content shell with chromeos=1 and embedded=1

Review URL: https://codereview.chromium.org/400793002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284759 0039d316-1c4b-4281-b951-d872f2087c98
parent 87778b64
......@@ -2475,6 +2475,9 @@
['use_ash==1', {
'defines': ['USE_ASH=1'],
}],
['use_pango==1', {
'defines': ['USE_PANGO=1'],
}],
['use_cairo==1', {
'defines': ['USE_CAIRO=1'],
}],
......
......@@ -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_PANGO)
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
std::string font_family = base::UTF16ToUTF8(
rb.GetLocalizedString(IDS_UI_FONT_FAMILY_CROS));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment