From 309c8ff514d506364567d9e6095a295b8d5c3d3e Mon Sep 17 00:00:00 2001 From: "nsylvain@chromium.org" Date: Wed, 25 Feb 2009 20:26:44 +0000 Subject: Fix all places where we used the GetWinVersion function incorrectly. bug:7802 Review URL: http://codereview.chromium.org/28128 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10366 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/installer/util/shell_util.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome/installer/util/shell_util.cc') diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc index 69721d3..422173c 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -407,7 +407,7 @@ ShellUtil::RegisterStatus ShellUtil::AddChromeToSetAccessDefaults( 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 @@ -470,7 +470,7 @@ bool ShellUtil::GetQuickLaunchPath(bool system_level, std::wstring* path) { 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"); @@ -559,7 +559,7 @@ bool ShellUtil::MakeChromeDefault(int shell_change, 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, -- cgit v1.1