Index: ui/base/resource/resource_bundle.cc |
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc |
index 4371e4fed6c73b30e95c06350e35e4243287548d..b3b9d16e6317691703e03f3c7d6568fd950f3e87 100644 |
--- a/ui/base/resource/resource_bundle.cc |
+++ b/ui/base/resource/resource_bundle.cc |
@@ -68,14 +68,17 @@ ResourceBundle* g_shared_instance_ = NULL; |
void InitDefaultFontList() { |
#if defined(OS_CHROMEOS) |
- gfx::FontList::SetDefaultFontDescription( |
- l10n_util::GetStringUTF8(IDS_UI_FONT_FAMILY_CROS)); |
- |
+ // gfx::PlatformFontPango::SetDefaultFontDescription must be called prior to |
+ // gfx::FontList::SetDefaultFontDescription because the latter uses the |
+ // default ctor of gfx::PlatformFontPango. |
// TODO(yukishiino): Remove SetDefaultFontDescription() once the migration to |
// the font list is done. We will no longer need SetDefaultFontDescription() |
// after every client gets started using a FontList instead of a Font. |
gfx::PlatformFontPango::SetDefaultFontDescription( |
l10n_util::GetStringUTF8(IDS_UI_FONT_FAMILY_CROS)); |
+ |
+ gfx::FontList::SetDefaultFontDescription( |
+ l10n_util::GetStringUTF8(IDS_UI_FONT_FAMILY_CROS)); |
#else |
// Use a single default font as the default font list. |
gfx::FontList::SetDefaultFontDescription(std::string()); |