| Index: chrome/common/pref_names.cc
|
| diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
|
| index f6dd8a8f2995b81d059ecea396bb3387cc08df66..ed8b58806dc6c5dcbe6a6ca19046adf29d8687e3 100644
|
| --- a/chrome/common/pref_names.cc
|
| +++ b/chrome/common/pref_names.cc
|
| @@ -173,8 +173,8 @@ const char kWebKitFantasyFontFamilyMap[] =
|
| // experimental.fontSettings.json must also change.
|
| const char* const kWebKitScriptsForFontFamilyMaps[] = {
|
| "Arab", "Armn", "Beng", "Cans", "Cher", "Cyrl", "Deva", "Ethi", "Geor",
|
| - "Grek", "Gujr", "Guru", "Hang", "Hans", "Hant", "Hebr", "Hrkt", "Knda",
|
| - "Khmr", "Laoo", "Mlym", "Mong", "Mymr", "Orya", "Sinh", "Taml", "Telu",
|
| + "Grek", "Gujr", "Guru", "Hans", "Hant", "Hebr", "Jpan", "Khmr", "Knda",
|
| + "Kore", "Laoo", "Mlym", "Mong", "Mymr", "Orya", "Sinh", "Taml", "Telu",
|
| "Thaa", "Thai", "Tibt", "Yiii", "Zyyy"
|
| };
|
|
|
| @@ -206,24 +206,6 @@ const char kWebKitSerifFontFamilyGreek[] =
|
| "webkit.webprefs.fonts.serif.Grek";
|
| const char kWebKitSansSerifFontFamilyGreek[] =
|
| "webkit.webprefs.fonts.sansserif.Grek";
|
| -const char kWebKitStandardFontFamilyJapanese[] =
|
| - "webkit.webprefs.fonts.standard.Hrkt";
|
| -const char kWebKitFixedFontFamilyJapanese[] =
|
| - "webkit.webprefs.fonts.fixed.Hrkt";
|
| -const char kWebKitSerifFontFamilyJapanese[] =
|
| - "webkit.webprefs.fonts.serif.Hrkt";
|
| -const char kWebKitSansSerifFontFamilyJapanese[] =
|
| - "webkit.webprefs.fonts.sansserif.Hrkt";
|
| -const char kWebKitStandardFontFamilyKorean[] =
|
| - "webkit.webprefs.fonts.standard.Hang";
|
| -const char kWebKitFixedFontFamilyKorean[] =
|
| - "webkit.webprefs.fonts.fixed.Hang";
|
| -const char kWebKitSerifFontFamilyKorean[] =
|
| - "webkit.webprefs.fonts.serif.Hang";
|
| -const char kWebKitSansSerifFontFamilyKorean[] =
|
| - "webkit.webprefs.fonts.sansserif.Hang";
|
| -const char kWebKitCursiveFontFamilyKorean[] =
|
| - "webkit.webprefs.fonts.cursive.Hang";
|
| const char kWebKitStandardFontFamilySimplifiedHan[] =
|
| "webkit.webprefs.fonts.standard.Hans";
|
| const char kWebKitFixedFontFamilySimplifiedHan[] =
|
| @@ -240,6 +222,24 @@ const char kWebKitSerifFontFamilyTraditionalHan[] =
|
| "webkit.webprefs.fonts.serif.Hant";
|
| const char kWebKitSansSerifFontFamilyTraditionalHan[] =
|
| "webkit.webprefs.fonts.sansserif.Hant";
|
| +const char kWebKitStandardFontFamilyJapanese[] =
|
| + "webkit.webprefs.fonts.standard.Jpan";
|
| +const char kWebKitFixedFontFamilyJapanese[] =
|
| + "webkit.webprefs.fonts.fixed.Jpan";
|
| +const char kWebKitSerifFontFamilyJapanese[] =
|
| + "webkit.webprefs.fonts.serif.Jpan";
|
| +const char kWebKitSansSerifFontFamilyJapanese[] =
|
| + "webkit.webprefs.fonts.sansserif.Jpan";
|
| +const char kWebKitStandardFontFamilyKorean[] =
|
| + "webkit.webprefs.fonts.standard.Kore";
|
| +const char kWebKitFixedFontFamilyKorean[] =
|
| + "webkit.webprefs.fonts.fixed.Kore";
|
| +const char kWebKitSerifFontFamilyKorean[] =
|
| + "webkit.webprefs.fonts.serif.Kore";
|
| +const char kWebKitSansSerifFontFamilyKorean[] =
|
| + "webkit.webprefs.fonts.sansserif.Kore";
|
| +const char kWebKitCursiveFontFamilyKorean[] =
|
| + "webkit.webprefs.fonts.cursive.Kore";
|
|
|
| const char kWebKitWebSecurityEnabled[] = "webkit.webprefs.web_security_enabled";
|
| const char kWebKitDomPasteEnabled[] = "webkit.webprefs.dom_paste_enabled";
|
|
|