| Index: ui/base/resource/resource_bundle.cc
|
| diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
|
| index aa0b6f5de93daceedf60dc922d26a07d504ad034..46db04e4c4b5dde561bce5b0519ff7cdf4fee413 100644
|
| --- a/ui/base/resource/resource_bundle.cc
|
| +++ b/ui/base/resource/resource_bundle.cc
|
| @@ -68,15 +68,14 @@
|
|
|
| void InitDefaultFontList() {
|
| #if defined(OS_CHROMEOS)
|
| - ResourceBundle& rb = ResourceBundle::GetSharedInstance();
|
| - std::string font_family = base::UTF16ToUTF8(
|
| - rb.GetLocalizedString(IDS_UI_FONT_FAMILY_CROS));
|
| - gfx::FontList::SetDefaultFontDescription(font_family);
|
| + gfx::FontList::SetDefaultFontDescription(
|
| + l10n_util::GetStringUTF8(IDS_UI_FONT_FAMILY_CROS));
|
|
|
| // 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(font_family);
|
| + gfx::PlatformFontPango::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());
|
|
|