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

Unified Diff: chrome/browser/memory_details_win.cc

Issue 6816024: Revert 80819 due to failed tests (Closed) Base URL: svn://svn.chromium.org/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
« no previous file with comments | « chrome/browser/importer/importer_unittest.cc ('k') | chrome/browser/nacl_host/nacl_process_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/memory_details_win.cc
===================================================================
--- chrome/browser/memory_details_win.cc (revision 80823)
+++ chrome/browser/memory_details_win.cc (working copy)
@@ -72,8 +72,8 @@
for (unsigned int index = 0; index < process_data_.size(); index++)
process_data_[index].processes.clear();
- base::win::OSInfo::WindowsArchitecture windows_architecture =
- base::win::OSInfo::GetInstance()->architecture();
+ base::win::WindowsArchitecture windows_architecture =
+ base::win::GetWindowsArchitecture();
base::win::ScopedHandle snapshot(
::CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0));
@@ -93,10 +93,10 @@
if (!process_handle.Get())
continue;
bool is_64bit_process =
- ((windows_architecture == base::win::OSInfo::X64_ARCHITECTURE) ||
- (windows_architecture == base::win::OSInfo::IA64_ARCHITECTURE)) &&
- (base::win::OSInfo::GetWOW64StatusForProcess(process_handle) ==
- base::win::OSInfo::WOW64_DISABLED);
+ ((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++) {
if (_wcsicmp(process_data_[index2].process_name.c_str(),
process_entry.szExeFile) != 0)
« no previous file with comments | « chrome/browser/importer/importer_unittest.cc ('k') | chrome/browser/nacl_host/nacl_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698