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

chrome/installer/util/shell_util.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.
 //
 // This file defines functions that integrate Chrome in Windows shell. These
 // functions can be used by Chrome as well as Chrome installer. All of the
 // work is done by the local functions defined in anonymous namespace in
 // this class.
 
 #include <windows.h>
@@ skipping 381 matching lines @@
 const wchar_t* ShellUtil::kRegUrlProtocol = L"URL Protocol";
 
 const wchar_t* ShellUtil::kChromeExtProgId = L"ChromeExt";
 const wchar_t* ShellUtil::kChromeExtProgIdDesc = L"Chrome Extension Installer";
 
 ShellUtil::RegisterStatus ShellUtil::AddChromeToSetAccessDefaults(
     const std::wstring& chrome_exe, bool skip_if_not_admin) {
   if (IsChromeRegistered(chrome_exe))
     return ShellUtil::SUCCESS;
 
-  if (win_util::GetWinVersion() == win_util::WINVERSION_VISTA)
+  if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA)
     return RegisterOnVista(chrome_exe, skip_if_not_admin);
 
   // Try adding these entries to HKLM first and if that fails try adding
   // to HKCU.
   if (SetAccessDefaultRegEntries(HKEY_LOCAL_MACHINE, chrome_exe))
     return ShellUtil::SUCCESS;
 
   if (!skip_if_not_admin &&
       SetAccessDefaultRegEntries(HKEY_CURRENT_USER, chrome_exe))
     return ShellUtil::REGISTERED_PER_USER;
@@ skipping 42 matching lines @@
     // We are accessing GetDefaultUserProfileDirectory this way so that we do
     // not have to declare dependency to Userenv.lib for chrome.exe
     typedef BOOL (WINAPI *PROFILE_FUNC)(LPWSTR, LPDWORD);
     HMODULE module = LoadLibrary(L"Userenv.dll");
     PROFILE_FUNC p = reinterpret_cast<PROFILE_FUNC>(GetProcAddress(module,
         "GetDefaultUserProfileDirectoryW"));
     DWORD size = _countof(qlaunch);
     if ((p == NULL) || ((p)(qlaunch, &size) != TRUE))
       return false;
     *path = qlaunch;
-    if (win_util::GetWinVersion() == win_util::WINVERSION_VISTA) {
+    if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) {
       file_util::AppendToPath(path, L"AppData\\Roaming");
     } else {
       file_util::AppendToPath(path, L"Application Data");
     }
   } else {
     if (FAILED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL,
                                SHGFP_TYPE_CURRENT, qlaunch)))
       return false;
     *path = qlaunch;
   }
@@ skipping 68 matching lines @@
   }
 
   return ret;
 }
 
 bool ShellUtil::MakeChromeDefault(int shell_change,
                                   const std::wstring chrome_exe) {
   bool ret = true;
   // First use the new "recommended" way on Vista to make Chrome default
   // browser.
-  if (win_util::GetWinVersion() == win_util::WINVERSION_VISTA) {
+  if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) {
     LOG(INFO) << "Registering Chrome as default browser on Vista.";
     IApplicationAssociationRegistration* pAAR;
     HRESULT hr = CoCreateInstance(CLSID_ApplicationAssociationRegistration,
         NULL, CLSCTX_INPROC, __uuidof(IApplicationAssociationRegistration),
         (void**)&pAAR);
     if (SUCCEEDED(hr)) {
       BrowserDistribution* dist = BrowserDistribution::GetDistribution();
       hr = pAAR->SetAppAsDefaultAll(dist->GetApplicationName().c_str());
       pAAR->Release();
     }
@@ skipping 98 matching lines @@
     return file_util::UpdateShortcutLink(chrome_exe.c_str(),      // target
                                          shortcut.c_str(),        // shortcut
                                          chrome_path.c_str(),     // working dir
                                          NULL,                    // arguments
                                          NULL,                    // description
                                          chrome_exe.c_str(),      // icon file
                                          0);                      // icon index
   }
 }