Move windows version-related stuff out of base/win_util and into base/win/win...

app/l10n_util_win.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
 
 #include <algorithm>
 #include <windowsx.h>
 
 #include "app/l10n_util_win.h"
 #include "base/i18n/rtl.h"
 #include "base/string_number_conversions.h"
-//#include "base/string_util.h"
-#include "base/win_util.h"
-
+#include "base/win/windows_version.h"
 #include "grit/app_locale_settings.h"
 
 namespace {
 
 void AdjustLogFont(const std::wstring& font_family,
                    double font_size_scaler,
                    LOGFONT* logfont) {
   DCHECK(font_size_scaler > 0);
   font_size_scaler = std::max(std::min(font_size_scaler, 2.0), 0.7);
   logfont->lfHeight = static_cast<long>(font_size_scaler *
@@ skipping 53 matching lines @@
     // the entire window rect.
     ::InvalidateRect(hwnd, NULL, true);
   }
 }
 
 bool IsLocaleSupportedByOS(const std::string& locale) {
   // Block Amharic on Windows XP unless 'Abyssinica SIL' font is present.
   // On Win XP, no Ethiopic/Amahric font is availabel out of box. We hard-coded
   // 'Abyssinica SIL' in the resource bundle to use in the UI. Check
   // for its presence to determine whether or not to support Amharic UI on XP.
-  return (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA ||
+  return (base::win::GetVersion() >= base::win::VERSION_VISTA ||
       !LowerCaseEqualsASCII(locale, "am") || IsFontPresent(L"Abyssinica SIL"));
 }
 
 bool NeedOverrideDefaultUIFont(std::wstring* override_font_family,
                                double* font_size_scaler) {
   // This is rather simple-minded to deal with the UI font size
   // issue for some Indian locales (ml, bn, hi) for which
   // the default Windows fonts are too small to be legible.  For those
   // locales, IDS_UI_FONT_FAMILY is set to an actual font family to
   // use while for other locales, it's set to 'default'.
 
   // XP and Vista or later have different font size issues and
   // we need separate ui font specifications.
   int ui_font_family_id = IDS_UI_FONT_FAMILY;
   int ui_font_size_scaler_id = IDS_UI_FONT_SIZE_SCALER;
-  if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
+  if (base::win::GetVersion() < base::win::VERSION_VISTA) {
     ui_font_family_id = IDS_UI_FONT_FAMILY_XP;
     ui_font_size_scaler_id = IDS_UI_FONT_SIZE_SCALER_XP;
   }
 
   std::wstring ui_font_family = GetString(ui_font_family_id);
   int scaler100;
   if (!base::StringToInt(l10n_util::GetString(ui_font_size_scaler_id),
                          &scaler100))
     return false;
 
@@ skipping 27 matching lines @@
     if (GetObject(GetWindowFont(hwnd), sizeof(logfont), &logfont)) {
       AdjustLogFont(ui_font_family, ui_font_size_scaler, &logfont);
       HFONT hfont = CreateFontIndirect(&logfont);
       if (hfont)
         SetWindowFont(hwnd, hfont, FALSE);
     }
   }
 }
 
 }  // namespace l10n_util