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

Unified Diff: chrome/browser/ui/prefs/prefs_tab_helper.cc

Issue 1587673011: Use the new standard japanese font on Windows 10, which is not installed in previous versions of Wi… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 | « chrome/app/resources/locale_settings_win.grd ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/prefs/prefs_tab_helper.cc
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc
index ee406dba2aa850aae60cdd785984e902bc21c395..ab3646c8cf394590b5f63a382b99c85a9dd1185a 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
@@ -561,6 +561,15 @@ void PrefsTabHelper::RegisterProfilePrefs(
l10n_util::GetStringUTF8(pref.resource_id)))
pref.resource_id = IDS_FIXED_FONT_FAMILY_ALT_WIN;
}
+
+ // The standard font (Meiryo) isn't installed by default as of Win 10.
+ if (base::win::GetVersion() >= base::win::VERSION_WIN10) {
+ if (pref.pref_name == prefs::kWebKitStandardFontFamilyJapanese) {
+ pref.resource_id = IDS_STANDARD_FONT_FAMILY_JAPANESE_ALT_WIN;
+ } else if (pref.pref_name == prefs::kWebKitSansSerifFontFamilyJapanese) {
+ pref.resource_id = IDS_SANS_SERIF_FONT_FAMILY_JAPANESE_ALT_WIN;
+ }
+ }
#endif
UScriptCode pref_script = GetScriptOfFontPref(pref.pref_name);
« no previous file with comments | « chrome/app/resources/locale_settings_win.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698