web-ui settings: Standard font setting now correlates to WebKit's standard font family only.

BUG=74434
TEST=Verify that changing the 'standard font' only applies to unspecified font styles.
Review URL: http://codereview.chromium.org/6602021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76463 0039d316-1c4b-4281-b951-d872f2087c98

20 files changed, 26 insertions, 32 deletions

diff --git a/chrome/app/resources/locale_settings_cros.grd b/chrome/app/resources/locale_settings_cros.grd
index c889b29..2e19308 100644
--- a/chrome/app/resources/locale_settings_cros.grd
+++ b/chrome/app/resources/locale_settings_cros.grd
@@ -142,10 +142,9 @@
         84%
       </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
+      <!-- The default value for |WebPreference::standard_font_family| -->
+      <message name="IDS_STANDARD_FONT_FAMILY" use_name_for_id="true">
+        Tinos
       </message>
 
       <!-- The default value for |WebPreference::fixed_font_family| -->
diff --git a/chrome/app/resources/locale_settings_linux.grd b/chrome/app/resources/locale_settings_linux.grd
index 7eb1589..d8c8958 100644
--- a/chrome/app/resources/locale_settings_linux.grd
+++ b/chrome/app/resources/locale_settings_linux.grd
@@ -142,10 +142,9 @@
         84%
       </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
+      <!-- The default value for |WebPreference::standard_font_family| -->
+      <message name="IDS_STANDARD_FONT_FAMILY" use_name_for_id="true">
+        Times New Roman
       </message>
 
       <!-- The default value for |WebPreference::fixed_font_family| -->
diff --git a/chrome/app/resources/locale_settings_mac.grd b/chrome/app/resources/locale_settings_mac.grd
index c7e816d..8064264 100644
--- a/chrome/app/resources/locale_settings_mac.grd
+++ b/chrome/app/resources/locale_settings_mac.grd
@@ -124,10 +124,9 @@
         84%
       </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
+      <!-- The default value for |WebPreference::standard_font_family| -->
+      <message name="IDS_STANDARD_FONT_FAMILY" use_name_for_id="true">
+        Times
       </message>
 
       <!-- The default value for |WebPreference::fixed_font_family| -->
diff --git a/chrome/app/resources/locale_settings_win.grd b/chrome/app/resources/locale_settings_win.grd
index 4415997..45f30f5 100644
--- a/chrome/app/resources/locale_settings_win.grd
+++ b/chrome/app/resources/locale_settings_win.grd
@@ -129,10 +129,9 @@
         84%
       </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
+      <!-- The default value for |WebPreference::standard_font_family| -->
+      <message name="IDS_STANDARD_FONT_FAMILY" use_name_for_id="true">
+        Times New Roman
       </message>
 
       <!-- The default value for |WebPreference::fixed_font_family| -->
diff --git a/chrome/app/resources/platform_locale_settings/locale_settings_cros_ja.xtb b/chrome/app/resources/platform_locale_settings/locale_settings_cros_ja.xtb
index ded57b5..f2646f7 100644
--- a/chrome/app/resources/platform_locale_settings/locale_settings_cros_ja.xtb
+++ b/chrome/app/resources/platform_locale_settings/locale_settings_cros_ja.xtb
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE translationbundle>
 <translationbundle lang="ja">
-<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
+<translation id="IDS_STANDARD_FONT_FAMILY">IPAPGothic</translation>
 <translation id="IDS_WEB_FONT_FAMILY">Chrome Droid Sans, Droid Sans Japanese, sans-serif</translation>
 <translation id="IDS_FIXED_FONT_FAMILY">IPAGothic</translation>
 <translation id="IDS_SERIF_FONT_FAMILY">IPAPMincho</translation>
diff --git a/chrome/app/resources/platform_locale_settings/locale_settings_cros_ko.xtb b/chrome/app/resources/platform_locale_settings/locale_settings_cros_ko.xtb
index 276032b..4088cf7 100644
--- a/chrome/app/resources/platform_locale_settings/locale_settings_cros_ko.xtb
+++ b/chrome/app/resources/platform_locale_settings/locale_settings_cros_ko.xtb
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE translationbundle>
 <translationbundle lang="ko">
-<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
+<translation id="IDS_STANDARD_FONT_FAMILY">Gulim</translation>
 <translation id="IDS_FIXED_FONT_FAMILY">Gulimche</translation>
 <translation id="IDS_SERIF_FONT_FAMILY">Batang</translation>
 <translation id="IDS_SANS_SERIF_FONT_FAMILY">Gulim</translation>
diff --git a/chrome/app/resources/platform_locale_settings/locale_settings_cros_zh-CN.xtb b/chrome/app/resources/platform_locale_settings/locale_settings_cros_zh-CN.xtb
index cfd0e31..5b2461e 100644
--- a/chrome/app/resources/platform_locale_settings/locale_settings_cros_zh-CN.xtb
+++ b/chrome/app/resources/platform_locale_settings/locale_settings_cros_zh-CN.xtb
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE translationbundle>
 <translationbundle lang="zh-CN">
-<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
+<translation id="IDS_STANDARD_FONT_FAMILY">Droid Sans Fallback</translation>
 <translation id="IDS_FIXED_FONT_FAMILY">NSong ASC</translation>
 <translation id="IDS_SERIF_FONT_FAMILY">Song ASC</translation>
 <translation id="IDS_SANS_SERIF_FONT_FAMILY">Droid Sans Fallback</translation>
diff --git a/chrome/app/resources/platform_locale_settings/locale_settings_cros_zh-TW.xtb b/chrome/app/resources/platform_locale_settings/locale_settings_cros_zh-TW.xtb
index 83f3e75..1c94f55 100644
--- a/chrome/app/resources/platform_locale_settings/locale_settings_cros_zh-TW.xtb
+++ b/chrome/app/resources/platform_locale_settings/locale_settings_cros_zh-TW.xtb
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE translationbundle>
 <translationbundle lang="zh-TW">
-<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
+<translation id="IDS_STANDARD_FONT_FAMILY">Droid Sans Fallback</translation>
 <translation id="IDS_FIXED_FONT_FAMILY">MingLiu</translation>
 <translation id="IDS_SERIF_FONT_FAMILY">PMingLiu</translation>
 <translation id="IDS_SANS_SERIF_FONT_FAMILY">Droid Sans Fallback</translation>
diff --git a/chrome/app/resources/platform_locale_settings/locale_settings_linux_ja.xtb b/chrome/app/resources/platform_locale_settings/locale_settings_linux_ja.xtb
index dfab18f..683de75 100644
--- a/chrome/app/resources/platform_locale_settings/locale_settings_linux_ja.xtb
+++ b/chrome/app/resources/platform_locale_settings/locale_settings_linux_ja.xtb
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE translationbundle>
 <translationbundle lang="ja">
-<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
+<translation id="IDS_STANDARD_FONT_FAMILY">VL PGothic</translation>
 <translation id="IDS_WEB_FONT_FAMILY">VL PGothic,Sazanami Gothic,Kochi Gothic,sans-serif</translation>
 <translation id="IDS_FIXED_FONT_FAMILY">VL Gothic</translation>
 <translation id="IDS_SERIF_FONT_FAMILY">Sazanami Mincho</translation>
diff --git a/chrome/app/resources/platform_locale_settings/locale_settings_linux_ko.xtb b/chrome/app/resources/platform_locale_settings/locale_settings_linux_ko.xtb
index f127c8b..0edc7fb 100644
--- a/chrome/app/resources/platform_locale_settings/locale_settings_linux_ko.xtb
+++ b/chrome/app/resources/platform_locale_settings/locale_settings_linux_ko.xtb
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE translationbundle>
 <translationbundle lang="ko">
-<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
+<translation id="IDS_STANDARD_FONT_FAMILY">UnDotum</translation>
 <translation id="IDS_WEB_FONT_FAMILY">NanumGothic,UnDotum,Baekmuk Gulim,sans-serif</translation>
 <translation id="IDS_FIXED_FONT_FAMILY">UnDotum</translation>
 <translation id="IDS_SERIF_FONT_FAMILY">UnBatang</translation>
diff --git a/chrome/app/resources/platform_locale_settings/locale_settings_linux_zh-CN.xtb b/chrome/app/resources/platform_locale_settings/locale_settings_linux_zh-CN.xtb
index 5916773..c63dd0a 100644
--- a/chrome/app/resources/platform_locale_settings/locale_settings_linux_zh-CN.xtb
+++ b/chrome/app/resources/platform_locale_settings/locale_settings_linux_zh-CN.xtb
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE translationbundle>
 <translationbundle lang="zh-CN">
-<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
+<translation id="IDS_STANDARD_FONT_FAMILY">AR PL UKai CN</translation>
 <translation id="IDS_WEB_FONT_FAMILY">AR PL UKai CN,sans-serif</translation>
 <translation id="IDS_FIXED_FONT_FAMILY">AR PL UKai CN</translation>
 <translation id="IDS_SERIF_FONT_FAMILY">AR PL UMing CN</translation>
diff --git a/chrome/app/resources/platform_locale_settings/locale_settings_linux_zh-TW.xtb b/chrome/app/resources/platform_locale_settings/locale_settings_linux_zh-TW.xtb
index ca80901..9de9059 100644
--- a/chrome/app/resources/platform_locale_settings/locale_settings_linux_zh-TW.xtb
+++ b/chrome/app/resources/platform_locale_settings/locale_settings_linux_zh-TW.xtb
@@ -2,7 +2,6 @@
 <!DOCTYPE translationbundle>
 <translationbundle lang="zh-TW">
 <translation id="IDS_WEB_FONT_FAMILY">AR PL UKai TW,sans-serif</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
 <translation id="IDS_MINIMUM_FONT_SIZE">12</translation>
 <translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">12</translation>
 </translationbundle>
diff --git a/chrome/app/resources/platform_locale_settings/locale_settings_mac_ja.xtb b/chrome/app/resources/platform_locale_settings/locale_settings_mac_ja.xtb
index 4f4fc0c..8ac22ee 100644
--- a/chrome/app/resources/platform_locale_settings/locale_settings_mac_ja.xtb
+++ b/chrome/app/resources/platform_locale_settings/locale_settings_mac_ja.xtb
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE translationbundle>
 <translationbundle lang="ja">
-<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
+<translation id="IDS_STANDARD_FONT_FAMILY">Hiragino Kaku Gothic Pro</translation>
 <translation id="IDS_WEB_FONT_FAMILY">Helvetica,Hiragino Kaku Gothic Pro,sans-serif</translation>
 <translation id="IDS_FIXED_FONT_FAMILY">Osaka-Mono</translation>
 <translation id="IDS_SERIF_FONT_FAMILY">Hiragino Mincho Pro</translation>
diff --git a/chrome/app/resources/platform_locale_settings/locale_settings_mac_ko.xtb b/chrome/app/resources/platform_locale_settings/locale_settings_mac_ko.xtb
index 0ba3567..60a2761 100644
--- a/chrome/app/resources/platform_locale_settings/locale_settings_mac_ko.xtb
+++ b/chrome/app/resources/platform_locale_settings/locale_settings_mac_ko.xtb
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE translationbundle>
 <translationbundle lang="ko">
-<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
+<translation id="IDS_STANDARD_FONT_FAMILY">AppleGothic</translation>
 <translation id="IDS_WEB_FONT_FAMILY">Helvetica,AppleGothic,sans-serif</translation>
 <translation id="IDS_SERIF_FONT_FAMILY">AppleMyungjo</translation>
 <translation id="IDS_SANS_SERIF_FONT_FAMILY">AppleGothic</translation>
diff --git a/chrome/app/resources/platform_locale_settings/locale_settings_mac_zh-CN.xtb b/chrome/app/resources/platform_locale_settings/locale_settings_mac_zh-CN.xtb
index 92464ec..5a45cf15 100644
--- a/chrome/app/resources/platform_locale_settings/locale_settings_mac_zh-CN.xtb
+++ b/chrome/app/resources/platform_locale_settings/locale_settings_mac_zh-CN.xtb
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE translationbundle>
 <translationbundle lang="zh-CN">
-<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
+<translation id="IDS_STANDARD_FONT_FAMILY">STHeiti</translation>
 <translation id="IDS_WEB_FONT_FAMILY">Helvetica,STHeiti,sans-serif</translation>
 <translation id="IDS_SERIF_FONT_FAMILY">STSong</translation>
 <translation id="IDS_SANS_SERIF_FONT_FAMILY">STHeiti</translation>
diff --git a/chrome/app/resources/platform_locale_settings/locale_settings_mac_zh-TW.xtb b/chrome/app/resources/platform_locale_settings/locale_settings_mac_zh-TW.xtb
index a5d29f7..09b7105 100644
--- a/chrome/app/resources/platform_locale_settings/locale_settings_mac_zh-TW.xtb
+++ b/chrome/app/resources/platform_locale_settings/locale_settings_mac_zh-TW.xtb
@@ -2,7 +2,7 @@
 <!DOCTYPE translationbundle>
 <translationbundle lang="zh-TW">
 <translation id="IDS_WEB_FONT_FAMILY">Helvetica,LiHei Pro,sans-serif</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
+<translation id="IDS_STANDARD_FONT_FAMILY">LiHei Pro</translation>
 <translation id="IDS_SERIF_FONT_FAMILY">LiSong Pro</translation>
 <translation id="IDS_SANS_SERIF_FONT_FAMILY">LiHei Pro</translation>
 <translation id="IDS_MINIMUM_FONT_SIZE">12</translation>
diff --git a/chrome/app/resources/platform_locale_settings/locale_settings_win_ja.xtb b/chrome/app/resources/platform_locale_settings/locale_settings_win_ja.xtb
index 3329fa5..372c955 100644
--- a/chrome/app/resources/platform_locale_settings/locale_settings_win_ja.xtb
+++ b/chrome/app/resources/platform_locale_settings/locale_settings_win_ja.xtb
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE translationbundle>
 <translationbundle lang="ja">
-<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
+<translation id="IDS_STANDARD_FONT_FAMILY">MS PGothic</translation>
 <translation id="IDS_WEB_FONT_FAMILY">Arial,Meiryo,MS PGothic,sans-serif</translation>
 <translation id="IDS_FIXED_FONT_FAMILY">MS Gothic</translation>
 <translation id="IDS_SERIF_FONT_FAMILY">MS PMincho</translation>
diff --git a/chrome/app/resources/platform_locale_settings/locale_settings_win_ko.xtb b/chrome/app/resources/platform_locale_settings/locale_settings_win_ko.xtb
index b4a4199..fc65878 100644
--- a/chrome/app/resources/platform_locale_settings/locale_settings_win_ko.xtb
+++ b/chrome/app/resources/platform_locale_settings/locale_settings_win_ko.xtb
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE translationbundle>
 <translationbundle lang="ko">
-<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
+<translation id="IDS_STANDARD_FONT_FAMILY">Gulim</translation>
 <translation id="IDS_WEB_FONT_FAMILY">Arial,Malgun Gothic,Gulim,sans-serif</translation>
 <translation id="IDS_FIXED_FONT_FAMILY">Gulimche</translation>
 <translation id="IDS_SERIF_FONT_FAMILY">Batang</translation>
diff --git a/chrome/app/resources/platform_locale_settings/locale_settings_win_zh-CN.xtb b/chrome/app/resources/platform_locale_settings/locale_settings_win_zh-CN.xtb
index 2d0f2c4..a82c87a 100644
--- a/chrome/app/resources/platform_locale_settings/locale_settings_win_zh-CN.xtb
+++ b/chrome/app/resources/platform_locale_settings/locale_settings_win_zh-CN.xtb
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE translationbundle>
 <translationbundle lang="zh-CN">
-<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
+<translation id="IDS_STANDARD_FONT_FAMILY">Simsun</translation>
 <translation id="IDS_WEB_FONT_FAMILY">Arial,Microsoft Yahei,Simsun,sans-serif</translation>
 <translation id="IDS_FIXED_FONT_FAMILY">NSimsun</translation>
 <translation id="IDS_SERIF_FONT_FAMILY">Simsun</translation>
diff --git a/chrome/app/resources/platform_locale_settings/locale_settings_win_zh-TW.xtb b/chrome/app/resources/platform_locale_settings/locale_settings_win_zh-TW.xtb
index 29c2bdd..5edc240 100644
--- a/chrome/app/resources/platform_locale_settings/locale_settings_win_zh-TW.xtb
+++ b/chrome/app/resources/platform_locale_settings/locale_settings_win_zh-TW.xtb
@@ -2,7 +2,6 @@
 <!DOCTYPE translationbundle>
 <translationbundle lang="zh-TW">
 <translation id="IDS_WEB_FONT_FAMILY">Arial,Microsoft Jhenghei,PMingLiu,sans-serif</translation>
-<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
 <translation id="IDS_MINIMUM_FONT_SIZE">12</translation>
 <translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">12</translation>
 </translationbundle>