From 0709309fe4242bd8bfe170684ea7fa9568a584ee Mon Sep 17 00:00:00 2001
From: "mark@chromium.org"
 <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 29 Sep 2009 21:32:55 +0000
Subject: Use Mac fonts in Mac Chrome.

Use Helvetica, Times, Courier, Apple Chancery, and Papyrus for sans-serif,
serif, monospace, cursive, and fantasy, respectively.  These are the fonts
used by Safari and Firefox on the Mac, and the fonts that we run layout tests
with on the Mac.

BUG=19135 21458
TEST=http://www.w3.org/Style/Examples/007/fonts
     Check the fonts for sans-serif, serif, monospace, cursive, fantasy
     Note that the font used for "Helvetica, sans-serif" is actually Verdana
Review URL: http://codereview.chromium.org/244039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27533 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/app/resources/locale_settings.grd | 158 +++++++++++++++++++++----------
 1 file changed, 107 insertions(+), 51 deletions(-)

(limited to 'chrome/app')

diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index 450be9a..1852491 100644
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -219,18 +219,30 @@
         <include name="IDR_TERMS_HTML" file="terms\terms_chromium.html" type="BINDATA" />
       </if>
     </includes>
-    <messages>
+    <messages fallback_to_english="true">
+
+      <if expr="os != 'darwin'">
+        <!-- The font used in web-style native pages (e.g. History). -->
+        <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true">
+          Arial
+        </message>
+
+        <!-- The relative font size in % used in web-style native pages
+        (e.g. History).  -->
+        <message name="IDS_WEB_FONT_SIZE" use_name_for_id="true">
+          84%
+        </message>
+      </if>
 
-      <!-- The font used in web-style native pages (e.g. History). -->
-      <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true">
-        Arial
-      </message>
+      <if expr="os == 'darwin'">
+        <message name="IDS_WEB_FONT_FAMILY" desc="The font used in web-style native pages (e.g. History) (Mac)">
+          Helvetica
+        </message>
 
-      <!-- The relative font size in % used in web-style native pages
-      (e.g. History).  -->
-      <message name="IDS_WEB_FONT_SIZE" use_name_for_id="true">
-        84%
-      </message>
+        <message name="IDS_WEB_FONT_SIZE" desc="The relative font size in % used in web-style native pages (e.g. History) (Mac)">
+          84%
+        </message>
+      </if>
 
       <!-- The default value for HTTP Accept-Language header. -->
       <message name="IDS_ACCEPT_LANGUAGES" use_name_for_id="true">
@@ -242,56 +254,100 @@
         ISO-8859-1
       </message>
 
-      <!-- The default value to determine whether
-           |WebPreference::standard_font_family| is serif or sans-serif. -->
-      <message name="IDS_STANDARD_FONT_IS_SERIF" use_name_for_id="true">
-        true
-      </message>
+      <if expr="os != 'darwin'">
+        <!-- The default value to determine whether
+             |WebPreference::standard_font_family| is serif or sans-serif. -->
+        <message name="IDS_STANDARD_FONT_IS_SERIF" use_name_for_id="true">
+          true
+        </message>
+
+        <!-- The default value for |WebPreference::fixed_font_family| -->
+        <message name="IDS_FIXED_FONT_FAMILY" use_name_for_id="true">
+          Courier New
+        </message>
+
+        <!-- The default value for |WebPreference::serif_font_family| -->
+        <message name="IDS_SERIF_FONT_FAMILY" use_name_for_id="true">
+          Times New Roman
+        </message>
+
+        <!-- The default value for |WebPreference::sans_serif_font_family| -->
+        <message name="IDS_SANS_SERIF_FONT_FAMILY" use_name_for_id="true">
+          Arial
+        </message>
+
+        <!-- The default value for |WebPreference::cursive_font_family| -->
+        <message name="IDS_CURSIVE_FONT_FAMILY" use_name_for_id="true">
+          Comic Sans MS
+        </message>
+
+        <!-- The default value for |WebPreference::fantasy_font_family| -->
+        <message name="IDS_FANTASY_FONT_FAMILY" use_name_for_id="true">
+          Impact
+        </message>
+
+        <!-- The default value for |WebPreference::default_font_size| -->
+        <message name="IDS_DEFAULT_FONT_SIZE" use_name_for_id="true">
+          16
+        </message>
+
+        <!-- The default value for |WebPreference::default_fixed_font_size| -->
+        <message name="IDS_DEFAULT_FIXED_FONT_SIZE" use_name_for_id="true">
+          13
+        </message>
+
+        <!-- The default value for |WebPreference::minimum_font_size| -->
+        <message name="IDS_MINIMUM_FONT_SIZE" use_name_for_id="true">
+          1
+        </message>
+
+        <!-- The default value for |WebPreference::minimum_logical_font_size|. -->
+        <message name="IDS_MINIMUM_LOGICAL_FONT_SIZE" use_name_for_id="true">
+          6
+        </message>
+      </if>
 
-      <!-- The default value for |WebPreference::fixed_font_family| -->
-      <message name="IDS_FIXED_FONT_FAMILY" use_name_for_id="true">
-        Courier New
-      </message>
+      <if expr="os == 'darwin'">
+        <message name="IDS_STANDARD_FONT_IS_SERIF" desc="The default value to determine whether |WebPreference::standard_font_family| is serif or sans-serif (Mac)">
+          true
+        </message>
 
-      <!-- The default value for |WebPreference::serif_font_family| -->
-      <message name="IDS_SERIF_FONT_FAMILY" use_name_for_id="true">
-        Times New Roman
-      </message>
+        <message name="IDS_FIXED_FONT_FAMILY" desc="The default value for |WebPreference::fixed_font_family| (Mac)">
+          Courier
+        </message>
 
-      <!-- The default value for |WebPreference::sans_serif_font_family| -->
-      <message name="IDS_SANS_SERIF_FONT_FAMILY" use_name_for_id="true">
-        Arial
-      </message>
+        <message name="IDS_SERIF_FONT_FAMILY" desc="The default value for |WebPreference::serif_font_family| (Mac)">
+          Times
+        </message>
 
-      <!-- The default value for |WebPreference::cursive_font_family| -->
-      <message name="IDS_CURSIVE_FONT_FAMILY" use_name_for_id="true">
-        Comic Sans MS
-      </message>
+        <message name="IDS_SANS_SERIF_FONT_FAMILY" desc="The default value for |WebPreference::sans_serif_font_family| (Mac)">
+          Helvetica
+        </message>
 
-      <!-- The default value for |WebPreference::fantasy_font_family| -->
-      <message name="IDS_FANTASY_FONT_FAMILY" use_name_for_id="true">
-        Impact
-      </message>
+        <message name="IDS_CURSIVE_FONT_FAMILY" desc="The default value for |WebPreference::cursive_font_family| (Mac)">
+          Apple Chancery
+        </message>
 
-      <!-- The default value for |WebPreference::default_font_size| -->
-      <message name="IDS_DEFAULT_FONT_SIZE" use_name_for_id="true">
-        16
-      </message>
+        <message name="IDS_FANTASY_FONT_FAMILY" desc="The default value for |WebPreference::fantasy_font_family| (Mac)">
+          Papyrus
+        </message>
 
-      <!-- The default value for |WebPreference::default_fixed_font_size| -->
-      <message name="IDS_DEFAULT_FIXED_FONT_SIZE" use_name_for_id="true">
-        13
-      </message>
+        <message name="IDS_DEFAULT_FONT_SIZE" desc="The default value for |WebPreference::default_font_size| (Mac)">
+          16
+        </message>
 
-      <!-- The default value for |WebPreference::minimum_font_size| -->
-      <message name="IDS_MINIMUM_FONT_SIZE" use_name_for_id="true">
-        1
-      </message>
+        <message name="IDS_DEFAULT_FIXED_FONT_SIZE" desc="The default value for |WebPreference::default_fixed_font_size| (Mac)">
+          13
+        </message>
 
-      <!-- The default value for |WebPreference::minimum_logical_font_size|. -->
-      <message name="IDS_MINIMUM_LOGICAL_FONT_SIZE" use_name_for_id="true">
-        6
-      </message>
+        <message name="IDS_MINIMUM_FONT_SIZE" desc="The default value for |WebPreference::minimum_font_size| (Mac)">
+          1
+        </message>
+
+        <message name="IDS_MINIMUM_LOGICAL_FONT_SIZE" desc="The default value for |WebPreference::minimum_logical_font_size| (Mac)">
+          9
+        </message>
+      </if>
 
       <!-- The default value for |WebPreference::uses_universal_detector|. -->
       <message name="IDS_USES_UNIVERSAL_DETECTOR" use_name_for_id="true">
-- 
cgit v1.1