Add default per-script CJK fonts on Windows.

chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 
 #include "base/utf_string_conversions.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 287 matching lines @@
   prefs->RegisterLocalizedStringPref(prefs::kWebKitSansSerifFontFamily,
                                      IDS_SANS_SERIF_FONT_FAMILY,
                                      PrefService::UNSYNCABLE_PREF);
   prefs->RegisterLocalizedStringPref(prefs::kWebKitCursiveFontFamily,
                                      IDS_CURSIVE_FONT_FAMILY,
                                      PrefService::UNSYNCABLE_PREF);
   prefs->RegisterLocalizedStringPref(prefs::kWebKitFantasyFontFamily,
                                      IDS_FANTASY_FONT_FAMILY,
                                      PrefService::UNSYNCABLE_PREF);
 
-  // Register per-script font prefs that have defaults.  Currently defaults are
-  // defined only for some scripts and only on Chrome OS to begin with (it is
-  // the easiest since we readily know what fonts are available there).
-  // TODO(falken): add defaults for all platforms and for scripts that should
-  // have defaults.
-#if defined(OS_CHROMEOS)
-  prefs->RegisterLocalizedStringPref(prefs::kWebKitStandardFontFamilyArabic,
-      IDS_STANDARD_FONT_FAMILY_ARABIC, PrefService::UNSYNCABLE_PREF);
-  prefs->RegisterLocalizedStringPref(prefs::kWebKitSerifFontFamilyArabic,
-      IDS_SERIF_FONT_FAMILY_ARABIC, PrefService::UNSYNCABLE_PREF);
-  prefs->RegisterLocalizedStringPref(prefs::kWebKitSansSerifFontFamilyArabic,
-      IDS_SANS_SERIF_FONT_FAMILY_ARABIC, PrefService::UNSYNCABLE_PREF);
+  // Register per-script font prefs that have defaults.  The prefs that have
+  // defaults vary by platform, since not all platforms have fonts for all
+  // scripts for all generic families.
+  // TODO(falken): add proper defaults when possible for all
+  // platforms/scripts/generic families.
+#if defined(OS_CHROMEOS) || defined(OS_WIN)

[sky, 2011/08/25 14:52:05]

These nested ifs are a bit unwieldy. How about an array at the top of the file
for each platform?

[falken, 2011/08/26 11:17:25]

Changed to use array.

   prefs->RegisterLocalizedStringPref(prefs::kWebKitStandardFontFamilyJapanese,
       IDS_STANDARD_FONT_FAMILY_JAPANESE, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterLocalizedStringPref(prefs::kWebKitFixedFontFamilyJapanese,
       IDS_FIXED_FONT_FAMILY_JAPANESE, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterLocalizedStringPref(prefs::kWebKitSerifFontFamilyJapanese,
       IDS_SERIF_FONT_FAMILY_JAPANESE, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterLocalizedStringPref(prefs::kWebKitSansSerifFontFamilyJapanese,
       IDS_SANS_SERIF_FONT_FAMILY_JAPANESE, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterLocalizedStringPref(prefs::kWebKitStandardFontFamilyKorean,
       IDS_STANDARD_FONT_FAMILY_KOREAN, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterLocalizedStringPref(prefs::kWebKitFixedFontFamilyKorean,
       IDS_FIXED_FONT_FAMILY_KOREAN, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterLocalizedStringPref(prefs::kWebKitSerifFontFamilyKorean,
       IDS_SERIF_FONT_FAMILY_KOREAN, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterLocalizedStringPref(prefs::kWebKitSansSerifFontFamilyKorean,
       IDS_SANS_SERIF_FONT_FAMILY_KOREAN, PrefService::UNSYNCABLE_PREF);
+#if defined(OS_WIN)
+  prefs->RegisterLocalizedStringPref(prefs::kWebKitCursiveFontFamilyKorean,
+      IDS_CURSIVE_FONT_FAMILY_KOREAN, PrefService::UNSYNCABLE_PREF);
+#endif
   prefs->RegisterLocalizedStringPref(
       prefs::kWebKitStandardFontFamilySimplifiedHan,
       IDS_STANDARD_FONT_FAMILY_SIMPLIFIED_HAN, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterLocalizedStringPref(prefs::kWebKitFixedFontFamilySimplifiedHan,
       IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterLocalizedStringPref(prefs::kWebKitSerifFontFamilySimplifiedHan,
       IDS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterLocalizedStringPref(
       prefs::kWebKitSansSerifFontFamilySimplifiedHan,
       IDS_SANS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN, PrefService::UNSYNCABLE_PREF);
+#endif
+
+#if defined(OS_CHROMEOS)
+  prefs->RegisterLocalizedStringPref(prefs::kWebKitStandardFontFamilyArabic,
+      IDS_STANDARD_FONT_FAMILY_ARABIC, PrefService::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(prefs::kWebKitSerifFontFamilyArabic,
+      IDS_SERIF_FONT_FAMILY_ARABIC, PrefService::UNSYNCABLE_PREF);
+  prefs->RegisterLocalizedStringPref(prefs::kWebKitSansSerifFontFamilyArabic,
+      IDS_SANS_SERIF_FONT_FAMILY_ARABIC, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterLocalizedStringPref(
       prefs::kWebKitStandardFontFamilyTraditionalHan,
       IDS_STANDARD_FONT_FAMILY_TRADITIONAL_HAN, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterLocalizedStringPref(
       prefs::kWebKitFixedFontFamilyTraditionalHan,
       IDS_FIXED_FONT_FAMILY_TRADITIONAL_HAN, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterLocalizedStringPref(
       prefs::kWebKitSerifFontFamilyTraditionalHan,
       IDS_SERIF_FONT_FAMILY_TRADITIONAL_HAN, PrefService::UNSYNCABLE_PREF);
   prefs->RegisterLocalizedStringPref(
@@ skipping 482 matching lines @@
 }
 
 void TabContentsWrapper::RemoveAllInfoBars(bool animate) {
   while (!infobars_.empty())
     RemoveInfoBarInternal(GetInfoBarDelegateAt(infobar_count() - 1), animate);
 }
 
 void TabContentsWrapper::ExitFullscreenMode() {
   Send(new ViewMsg_ExitFullscreen(routing_id()));
 }