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

chrome/browser/browser_main_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 "chrome/browser/browser_main.h"
 #include "chrome/browser/browser_main_win.h"
 
 #include <windows.h>
 #include <shellapi.h>
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/win_util.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/i18n/rtl.h"
 #include "base/nss_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/views/uninstall_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/shell_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/winsock_init.h"
 #include "net/socket/ssl_client_socket_nss_factory.h"
 #include "views/focus/accelerator_handler.h"
 #include "views/window/window.h"
 
 void DidEndMainMessageLoop() {
   OleUninitialize();
 }
 
 void RecordBreakpadStatusUMA(MetricsService* metrics) {
   DWORD len = ::GetEnvironmentVariableW(
       ASCIIToWide(env_vars::kNoOOBreakpad).c_str() , NULL, 0);
   metrics->RecordBreakpadRegistration((len == 0));
   metrics->RecordBreakpadHasDebugger(TRUE == ::IsDebuggerPresent());
 }
 
 void WarnAboutMinimumSystemRequirements() {
-  if (win_util::GetWinVersion() < win_util::WINVERSION_XP) {
+  if (base::win::GetVersion() < base::win::VERSION_XP) {
     // Display a warning message if the user is running chrome on Windows 2000.
     const std::wstring text =
         l10n_util::GetString(IDS_UNSUPPORTED_OS_PRE_WIN_XP);
     const std::wstring caption = l10n_util::GetString(IDS_PRODUCT_NAME);
     win_util::MessageBox(NULL, text, caption,
                          MB_OK | MB_ICONWARNING | MB_TOPMOST);
   }
 }
 
 int AskForUninstallConfirmation() {
@@ skipping 78 matching lines @@
   env->SetVar(env_vars::kRestartInfo, UTF16ToUTF8(dlg_strings));
 }
 
 // This method handles the --hide-icons and --show-icons command line options
 // for chrome that get triggered by Windows from registry entries
 // HideIconsCommand & ShowIconsCommand. Chrome doesn't support hide icons
 // functionality so we just ask the users if they want to uninstall Chrome.
 int HandleIconsCommands(const CommandLine &parsed_command_line) {
   if (parsed_command_line.HasSwitch(switches::kHideIcons)) {
     std::wstring cp_applet;
-    win_util::WinVersion version = win_util::GetWinVersion();
-    if (version >= win_util::WINVERSION_VISTA) {
+    base::win::Version version = base::win::GetVersion();
+    if (version >= base::win::VERSION_VISTA) {
       cp_applet.assign(L"Programs and Features");  // Windows Vista and later.
-    } else if (version >= win_util::WINVERSION_XP) {
+    } else if (version >= base::win::VERSION_XP) {
       cp_applet.assign(L"Add/Remove Programs");  // Windows XP.
     } else {
       return ResultCodes::UNSUPPORTED_PARAM;  // Not supported
     }
 
     const std::wstring msg = l10n_util::GetStringF(IDS_HIDE_ICONS_NOT_SUPPORTED,
                                                    cp_applet);
     const std::wstring caption = l10n_util::GetString(IDS_PRODUCT_NAME);
     const UINT flags = MB_OKCANCEL | MB_ICONWARNING | MB_TOPMOST;
     if (IDOK == win_util::MessageBox(NULL, msg, caption, flags))
@@ skipping 67 matching lines @@
       base::EnsureNSPRInit();
     }
   }
 };
 
 // static
 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts(
     const MainFunctionParams& parameters) {
   return new BrowserMainPartsWin(parameters);
 }