summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorfinnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-17 03:16:38 +0000
committerfinnur@google.com <finnur@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-17 03:16:38 +0000
commit38a0e3a3af10f1962885ea9a6dce6673e82085e7 (patch)
treea9d4ede8ee8dc0fdca07c9b60beb430e63f39753 /chrome
parentdcdfa97ed0e5a2961f2834d37f1a2db4a6649b29 (diff)
downloadchromium_src-38a0e3a3af10f1962885ea9a6dce6673e82085e7.zip
chromium_src-38a0e3a3af10f1962885ea9a6dce6673e82085e7.tar.gz
chromium_src-38a0e3a3af10f1962885ea9a6dce6673e82085e7.tar.bz2
According to reports in the field, some XP machines have a registry flag that says "Disable UAC". Possibly, this is governed by a policy setting on corporate networks.
In any case, this causes the About box to think we can't perform on-demand updates. We should never block on-demand updates on XP. Review URL: http://codereview.chromium.org/2901 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/views/about_chrome_view.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc
index 02eb5ce..5d648a6 100644
--- a/chrome/browser/views/about_chrome_view.cc
+++ b/chrome/browser/views/about_chrome_view.cc
@@ -259,6 +259,7 @@ void AboutChromeView::ViewHierarchyChanged(bool is_add,
int service_pack_major = 0, service_pack_minor = 0;
win_util::GetServicePackLevel(&service_pack_major, &service_pack_minor);
if (win_util::UserAccountControlIsEnabled() ||
+ win_util::GetWinVersion() == win_util::WINVERSION_XP ||
(win_util::GetWinVersion() == win_util::WINVERSION_VISTA &&
service_pack_major >= 1)) {
UpdateStatus(UPGRADE_CHECK_STARTED, GOOGLE_UPDATE_NO_ERROR);