Fix font sizes being incorrect when using --force-device-scale-factor.

ui/base/l10n/l10n_util_win.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 "ui/base/l10n/l10n_util_win.h"
 
 #include <windowsx.h>
 #include <algorithm>
 #include <iterator>
 
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/i18n.h"
 #include "base/win/windows_version.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/display/display.h"
-#include "ui/display/win/dpi.h"
+#include "ui/display/win/screen_win.h"
 #include "ui/strings/grit/app_locale_settings.h"
 
 namespace {
 
 void AdjustLogFont(const base::string16& font_family,
                    double font_size_scaler,
                    double dpi_scale,
                    LOGFONT* logfont) {
   DCHECK(font_size_scaler > 0);
   font_size_scaler = std::max(std::min(font_size_scaler, 2.0), 0.7);
@@ skipping 116 matching lines @@
       ui_font_family.empty())
     return false;
   if (override_font_family && font_size_scaler) {
     override_font_family->swap(ui_font_family);
     *font_size_scaler = scaler100 / 100.0;
   }
   return true;
 }
 
 void AdjustUIFont(LOGFONT* logfont) {
-  float dpi_scale = display::win::GetDPIScale();
-  if (display::Display::HasForceDeviceScaleFactor()) {
-    // If the scale is forced, we don't need to adjust it here.
-    dpi_scale = 1.0f;
-  }
-  AdjustUIFontForDIP(dpi_scale, logfont);
+  // Use the unforced scale so the font will be normalized to the correct DIP
+  // value. That way it'll appear the right size when the forced scale is
+  // applied later (when coverting to pixels).
+  AdjustUIFontForDIP(display::win::ScreenWin::GetSystemScaleFactor(), logfont);
 }
 
 void AdjustUIFontForDIP(float dpi_scale, LOGFONT* logfont) {
   base::string16 ui_font_family = L"default";
   double ui_font_size_scaler = 1;
   if (NeedOverrideDefaultUIFont(&ui_font_family, &ui_font_size_scaler) ||
       dpi_scale != 1) {
     AdjustLogFont(ui_font_family, ui_font_size_scaler, dpi_scale, logfont);
   }
 }
@@ skipping 24 matching lines @@
   } else {
     NOTREACHED() << "Failed to determine the UI language for locale override.";
   }
 }
 
 const std::vector<std::string>& GetLocaleOverrides() {
   return override_locale_holder.Get().value();
 }
 
 }  // namespace l10n_util