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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/about_chrome_view.cc

Issue 6713107: Make the windows_version.h functions threadsafe by using a singleton. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 8 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
« base/win/windows_version.h ('K') | « chrome/browser/nacl_host/nacl_process_host.cc ('k') | chrome/installer/gcapi/gcapi.cc » ('j') | chrome/test/out_of_proc_test_runner.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/about_chrome_view.cc
===================================================================
--- chrome/browser/ui/views/about_chrome_view.cc (revision 80667)
+++ chrome/browser/ui/views/about_chrome_view.cc (working copy)
@@ -532,10 +532,8 @@
// on-demand updates. Silent updates (in the background) should still
// work as before - enabling UAC or installing the latest service pack
// for Vista is another option.
- int service_pack_major = 0, service_pack_minor = 0;
- base::win::GetServicePackLevel(&service_pack_major, &service_pack_minor);
if (!(base::win::GetVersion() == base::win::VERSION_VISTA &&
- (service_pack_major == 0) &&
+ (base::win::OSInfo::GetInstance()->service_pack()[0] == 0) &&
!base::win::UserAccountControlIsEnabled())) {
UpdateStatus(UPGRADE_CHECK_STARTED, GOOGLE_UPDATE_NO_ERROR);
// CheckForUpdate(false, ...) means don't upgrade yet.
« base/win/windows_version.h ('K') | « chrome/browser/nacl_host/nacl_process_host.cc ('k') | chrome/installer/gcapi/gcapi.cc » ('j') | chrome/test/out_of_proc_test_runner.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698