diff options
| author | falken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 11:36:25 +0000 |
|---|---|---|
| committer | falken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 11:36:25 +0000 |
| commit | e722eeebb0c2ffec5b42d83a874078df61bea329 (patch) | |
| tree | d95a4fd62268ad5be50be4d2cd4cb6a124251bb0 /chrome/app | |
| parent | e8cc8b3a52b7d8f9ed720b59ed77827c82d73033 (diff) | |
| download | chromium_src-e722eeebb0c2ffec5b42d83a874078df61bea329.zip chromium_src-e722eeebb0c2ffec5b42d83a874078df61bea329.tar.gz chromium_src-e722eeebb0c2ffec5b42d83a874078df61bea329.tar.bz2 | |
Pass per-script fonts to WebKit settings.
WebKit now has per-script font settings (https://bugs.webkit.org/show_bug.cgi?id=20797).
This change adds per-script font preferences to Chromium and passes them to the WebKit settings. For this
first patch, default per-script fonts are defined only on Chrome OS, and only for Arabic and CJK scripts.
It specifies the default fonts in locale_settings_cros.grd. The preferences are passed to WebPreferences in render_view_host_delegate_helper.cc (in the same manner as current font preferences).
BUG=92302
TEST=manually
Review URL: http://codereview.chromium.org/7606028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98024 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/resources/locale_settings_cros.grd | 114 |
1 files changed, 114 insertions, 0 deletions
diff --git a/chrome/app/resources/locale_settings_cros.grd b/chrome/app/resources/locale_settings_cros.grd index 2f65d90..9e66825 100644 --- a/chrome/app/resources/locale_settings_cros.grd +++ b/chrome/app/resources/locale_settings_cros.grd @@ -193,6 +193,120 @@ Impact </message> + <!-- The default value for |WebPreference::standard_font_family_map| for + Arabic script. --> + <message name="IDS_STANDARD_FONT_FAMILY_ARABIC" use_name_for_id="true"> + Droid Arabic Naskh + </message> + + <!-- The default value for |WebPreference::serif_font_family_map| for + Arabic script. --> + <message name="IDS_SERIF_FONT_FAMILY_ARABIC" use_name_for_id="true"> + Droid Arabic Kufi + </message> + + <!-- The default value for |WebPreference::sans_serif_font_family_map| for + Arabic script. --> + <message name="IDS_SANS_SERIF_FONT_FAMILY_ARABIC" use_name_for_id="true"> + Droid Arabic Naskh + </message> + + <!-- The default value for |WebPreference::standard_font_family_map| for + Japanese script. --> + <message name="IDS_STANDARD_FONT_FAMILY_JAPANESE" use_name_for_id="true"> + IPAPGothic + </message> + + <!-- The default value for |WebPreference::fixed_font_family_map| for + Japanese script. --> + <message name="IDS_FIXED_FONT_FAMILY_JAPANESE" use_name_for_id="true"> + IPAGothic + </message> + + <!-- The default value for |WebPreference::serif_font_family_map| for + Japanese script. --> + <message name="IDS_SERIF_FONT_FAMILY_JAPANESE" use_name_for_id="true"> + IPAPMincho + </message> + + <!-- The default value for |WebPreference::sans_serif_font_family_map| for + Japanese script. --> + <message name="IDS_SANS_SERIF_FONT_FAMILY_JAPANESE" use_name_for_id="true"> + IPAPGothic + </message> + + <!-- The default value for |WebPreference::standard_font_family_map| for + Korean script. --> + <message name="IDS_STANDARD_FONT_FAMILY_KOREAN" use_name_for_id="true"> + NanumGothic + </message> + + <!-- The default value for |WebPreference::fixed_font_family_map| for + Korean script. --> + <message name="IDS_FIXED_FONT_FAMILY_KOREAN" use_name_for_id="true"> + Monospace + </message> + + <!-- The default value for |WebPreference::serif_font_family_map| for + Korean script. --> + <message name="IDS_SERIF_FONT_FAMILY_KOREAN" use_name_for_id="true"> + NanumMyeongjo + </message> + + <!-- The default value for |WebPreference::sans_serif_font_family_map| for + Korean script. --> + <message name="IDS_SANS_SERIF_FONT_FAMILY_KOREAN" use_name_for_id="true"> + NanumGothic + </message> + + <!-- The default value for |WebPreference::standard_font_family_map| for + Simplified Chinese script. --> + <message name="IDS_STANDARD_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true"> + Droid Sans Fallback + </message> + + <!-- The default value for |WebPreference::fixed_font_family_map| for + Simplified Chinese script. --> + <message name="IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true"> + N Song ASC + </message> + + <!-- The default value for |WebPreference::serif_font_family_map| for + Simplified Chinese script. --> + <message name="IDS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true"> + Song ASC + </message> + + <!-- The default value for |WebPreference::sans_serif_font_family_map| for + Simplified Chinese script. --> + <message name="IDS_SANS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true"> + Droid Sans Fallback + </message> + + <!-- The default value for |WebPreference::standard_font_family_map| for + Traditional Chinese script. --> + <message name="IDS_STANDARD_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true"> + Droid Sans Fallback + </message> + + <!-- The default value for |WebPreference::fixed_font_family_map| for + Traditional Chinese script. --> + <message name="IDS_FIXED_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true"> + MingLiU + </message> + + <!-- The default value for |WebPreference::serif_font_family_map| for + Traditional Chinese script. --> + <message name="IDS_SERIF_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true"> + PMingLiU + </message> + + <!-- The default value for |WebPreference::sans_serif_font_family_map| for + Traditional Chinese script. --> + <message name="IDS_SANS_SERIF_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true"> + Droid Sans Fallback + </message> + <!-- The default value for |WebPreference::default_font_size| --> <message name="IDS_DEFAULT_FONT_SIZE" use_name_for_id="true"> 16 |