summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorfalken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-17 12:55:21 +0000
committerfalken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-17 12:55:21 +0000
commit3d15dd01e33e57762d7492c8b0afc3f2b537bad4 (patch)
tree644d223ea71ad96069905327b6bef62a2d98f3f7 /chrome/app
parentb58a53601fc186e195078f27423a360a0656ac85 (diff)
downloadchromium_src-3d15dd01e33e57762d7492c8b0afc3f2b537bad4.zip
chromium_src-3d15dd01e33e57762d7492c8b0afc3f2b537bad4.tar.gz
chromium_src-3d15dd01e33e57762d7492c8b0afc3f2b537bad4.tar.bz2
Fix incorrect #if defined(OS_MAC) and some comments for per-script fonts.
These changes were originally part of http://codereview.chromium.org/8113030/ which has LGTM, but that patch won't be committed itself because the Linux part requires some more work. BUG=94217 TEST=on Mac, go to a webpage that uses -webkit-locale, verify the default fonts are chosen TBR=sky Review URL: http://codereview.chromium.org/8312016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105795 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/resources/locale_settings_mac.grd2
-rw-r--r--chrome/app/resources/locale_settings_win.grd2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/app/resources/locale_settings_mac.grd b/chrome/app/resources/locale_settings_mac.grd
index 9ffcd73..746a4e9 100644
--- a/chrome/app/resources/locale_settings_mac.grd
+++ b/chrome/app/resources/locale_settings_mac.grd
@@ -156,7 +156,7 @@
</message>
<!-- The default value for |WebPreference::standard_font_family_map| for
- Japanese script on Windows. -->
+ Japanese script. -->
<message name="IDS_STANDARD_FONT_FAMILY_JAPANESE" use_name_for_id="true">
Hiragino Kaku Gothic Pro
</message>
diff --git a/chrome/app/resources/locale_settings_win.grd b/chrome/app/resources/locale_settings_win.grd
index 351ae47..7c09ef4 100644
--- a/chrome/app/resources/locale_settings_win.grd
+++ b/chrome/app/resources/locale_settings_win.grd
@@ -161,7 +161,7 @@
</message>
<!-- The default value for |WebPreference::standard_font_family_map| for
- Japanese script on Windows. -->
+ Japanese script. -->
<message name="IDS_STANDARD_FONT_FAMILY_JAPANESE" use_name_for_id="true">
MS PGothic
</message>