Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6024)

Unified Diff: chrome/installer/util/shell_util.cc

Issue 28128: Fix all places where we used the GetWinVersion function... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/setup/main.cc ('k') | chrome/test/mini_installer_test/test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/shell_util.cc
===================================================================
--- chrome/installer/util/shell_util.cc (revision 10275)
+++ chrome/installer/util/shell_util.cc (working copy)
@@ -399,7 +399,7 @@
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
@@ -462,7 +462,7 @@
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");
@@ -551,7 +551,7 @@
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,
« no previous file with comments | « chrome/installer/setup/main.cc ('k') | chrome/test/mini_installer_test/test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698