Fix all places where we used the GetWinVersion function...

chrome/browser/browser_main_win.cc

 // Copyright (c) 2006-2008 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/common/win_util.h"
 
 #include <shellapi.h>
 #include <windows.h>
 
 #include "chrome/browser/browser_main_win.h"
@@ skipping 95 matching lines @@
   ::SetEnvironmentVariableW(env_vars::kRestartInfo, dlg_strings.c_str());
 }
 
 // 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;
-    if (win_util::GetWinVersion() == win_util::WINVERSION_VISTA) {
+    win_util::WinVersion version = win_util::GetWinVersion();
+    if (version >= win_util::WINVERSION_VISTA) {
       cp_applet.assign(L"Programs and Features");  // Windows Vista and later.
-    } else if (win_util::GetWinVersion() == win_util::WINVERSION_XP) {
+    } else if (version >= win_util::WINVERSION_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 50 matching lines @@
 
 // We record in UMA the conditions that can prevent breakpad from generating
 // and sending crash reports. Namely that the crash reporting registration
 // failed and that the process is being debugged.
 void RecordBreakpadStatusUMA(MetricsService* metrics) {
   DWORD len = ::GetEnvironmentVariableW(env_vars::kNoOOBreakpad, NULL, 0);
   metrics->RecordBreakpadRegistration((len == 0));
   metrics->RecordBreakpadHasDebugger(TRUE == ::IsDebuggerPresent());
 }