diff options
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/memory_details_win.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/ui/views/about_chrome_view.cc | 8 |
2 files changed, 9 insertions, 10 deletions
diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc index edb53c8..f6548fe 100644 --- a/chrome/browser/memory_details_win.cc +++ b/chrome/browser/memory_details_win.cc @@ -11,6 +11,7 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/win/scoped_handle.h" +#include "base/win/win_util.h" #include "base/win/windows_version.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/url_constants.h" @@ -72,10 +73,8 @@ void MemoryDetails::CollectProcessData( for (unsigned int index = 0; index < process_data_.size(); index++) process_data_[index].processes.clear(); - SYSTEM_INFO system_info; - GetNativeSystemInfo(&system_info); - bool is_64bit_os = - system_info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64; + base::win::WindowsArchitecture windows_architecture = + base::win::GetWindowsArchitecture(); base::win::ScopedHandle snapshot( ::CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0)); @@ -94,7 +93,9 @@ void MemoryDetails::CollectProcessData( PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid)); if (!process_handle.Get()) continue; - bool is_64bit_process = is_64bit_os && + bool is_64bit_process = + ((windows_architecture == base::win::X64_ARCHITECTURE) || + (windows_architecture == base::win::IA64_ARCHITECTURE)) && (base::win::GetWOW64StatusForProcess(process_handle) == base::win::WOW64_DISABLED); for (unsigned int index2 = 0; index2 < process_data_.size(); index2++) { diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc index 8813a27..288b221 100644 --- a/chrome/browser/ui/views/about_chrome_view.cc +++ b/chrome/browser/ui/views/about_chrome_view.cc @@ -534,11 +534,9 @@ void AboutChromeView::ViewHierarchyChanged(bool is_add, // 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::UserAccountControlIsEnabled() || - base::win::GetVersion() == base::win::VERSION_XP || - (base::win::GetVersion() == base::win::VERSION_VISTA && - service_pack_major >= 1) || - base::win::GetVersion() > base::win::VERSION_VISTA) { + if (!(base::win::GetVersion() == base::win::VERSION_VISTA && + (service_pack_major == 0) && + !base::win::UserAccountControlIsEnabled())) { UpdateStatus(UPGRADE_CHECK_STARTED, GOOGLE_UPDATE_NO_ERROR); // CheckForUpdate(false, ...) means don't upgrade yet. google_updater_->CheckForUpdate(false, window()); |