Merge 279449 "Use Consolas for Windows 7 and above as default mo..."

chrome/browser/ui/prefs/prefs_tab_helper.cc

 // Copyright (c) 2012 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/prefs/prefs_tab_helper.h"
 
 #include <string>
 
 #include "base/prefs/overlay_user_pref_store.h"
 #include "base/prefs/pref_service.h"
@@ skipping 16 matching lines @@
 #include "grit/platform_locale_settings.h"
 #include "third_party/icu/source/common/unicode/uchar.h"
 #include "third_party/icu/source/common/unicode/uscript.h"
 #include "webkit/common/webpreferences.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES)
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #endif
 
+#if defined(OS_WIN)
+#include "base/win/windows_version.h"
+#endif
+
 using content::WebContents;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(PrefsTabHelper);
 
 namespace {
 
 // The list of prefs we want to observe.
 const char* kPrefsToObserve[] = {
   prefs::kDefaultCharset,
   prefs::kWebKitAllowDisplayingInsecureContent,
@@ skipping 70 matching lines @@
     const PrefChangeRegistrar::NamedChangeCallback& obs) {
   DCHECK(StartsWithASCII(map_name, "webkit.webprefs.", true));
   for (size_t i = 0; i < prefs::kWebKitScriptsForFontFamilyMapsLength; ++i) {
     const char* script = prefs::kWebKitScriptsForFontFamilyMaps[i];
     std::string pref_name = base::StringPrintf("%s.%s", map_name, script);
     registrar->Add(pref_name.c_str(), obs);
   }
 }
 #endif  // !defined(OS_ANDROID)
 
+#if defined(OS_WIN)
+// On Windows with DirectWrite we want to use an alternate fixed font like
+// Consolas, which looks much better than Courier New.
+bool ShouldUseAlternateDefaultFixedFont() {
+  UINT smooth_type = 0;
+  SystemParametersInfo(SPI_GETFONTSMOOTHINGTYPE, 0, &smooth_type, 0);
+  return (base::win::GetVersion() >= base::win::VERSION_WIN7) &&
+         (smooth_type == FE_FONTSMOOTHINGCLEARTYPE);
+}
+#endif
+
 struct FontDefault {
   const char* pref_name;
   int resource_id;
 };
 
 // Font pref 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.
 const FontDefault kFontDefaults[] = {
@@ skipping 310 matching lines @@
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterLocalizedStringPref(
       prefs::kDefaultCharset,
       IDS_DEFAULT_ENCODING,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 
   // Register font prefs that have defaults.
   std::set<std::string> fonts_with_defaults;
   UScriptCode browser_script = GetScriptOfBrowserLocale();
   for (size_t i = 0; i < kFontDefaultsLength; ++i) {
-    const FontDefault& pref = kFontDefaults[i];
+    FontDefault pref = kFontDefaults[i];
+
+#if defined(OS_WIN)
+    if (pref.pref_name == prefs::kWebKitFixedFontFamily) {
+      if (ShouldUseAlternateDefaultFixedFont())
+        pref.resource_id = IDS_FIXED_FONT_FAMILY_ALT_WIN;
+    }
+#endif
+
     UScriptCode pref_script = GetScriptOfFontPref(pref.pref_name);
 
     // Suppress this default font pref value if it is for the primary script of
     // the browser's UI locale.  For example, if the pref is for the sans-serif
     // font for the Cyrillic script, and the browser locale is "ru" (Russian),
     // the default is suppressed.  Otherwise, the default would override the
     // user's font preferences when viewing pages in their native language.
     // This is because users have no way yet of customizing their per-script
     // font preferences.  The font prefs accessible in the options UI are for
     // the default, unknown script; these prefs have less priority than the
@@ skipping 104 matching lines @@
       WebPreferences web_prefs =
           web_contents_->GetRenderViewHost()->GetWebkitPreferences();
       OverrideFontFamily(&web_prefs, generic_family, script, std::string());
       web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs);
       return;
     }
   }
 
   UpdateWebPreferences();
 }