Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Unified Diff: ui/base/resource/resource_bundle.cc

Issue 151163003: Revert of Enable icu_use_data_file_flag on CrOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698