summaryrefslogtreecommitdiffstats
path: root/chrome/installer
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/installer')
-rw-r--r--chrome/installer/setup/main.cc2
-rw-r--r--chrome/installer/util/shell_util.cc6
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/installer/setup/main.cc b/chrome/installer/setup/main.cc
index 314d5fc..0fe810e 100644
--- a/chrome/installer/setup/main.cc
+++ b/chrome/installer/setup/main.cc
@@ -524,7 +524,7 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
}
if (system_install && !IsUserAnAdmin()) {
- if (win_util::GetWinVersion() == win_util::WINVERSION_VISTA &&
+ if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA &&
!parsed_command_line.HasSwitch(installer_util::switches::kRunAsAdmin)) {
std::wstring exe = parsed_command_line.program();
std::wstring params(command_line);
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,