diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-17 22:40:52 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-17 22:40:52 +0000 |
| commit | aef8d5ae72f5da1a2668d9c2bac4596d4c6f0266 (patch) | |
| tree | f40ef2624dc3f18385c4eebd14c4d42da3690149 /chrome/browser | |
| parent | d7b4cc7de3c097014cd3850bc6e01e2e5d69d657 (diff) | |
| download | chromium_src-aef8d5ae72f5da1a2668d9c2bac4596d4c6f0266.zip chromium_src-aef8d5ae72f5da1a2668d9c2bac4596d4c6f0266.tar.gz chromium_src-aef8d5ae72f5da1a2668d9c2bac4596d4c6f0266.tar.bz2 | |
Add support for showing NaCl 64-bit processes in Chrome's task manager and about:memory page
BUG=37732
TEST=none
Review URL: http://codereview.chromium.org/807005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/memory_details.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/memory_details_win.cc | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc index 466cfc3..7c9a7d0 100644 --- a/chrome/browser/memory_details.cc +++ b/chrome/browser/memory_details.cc @@ -215,6 +215,9 @@ void MemoryDetails::UpdateHistograms() { case ChildProcessInfo::NACL_LOADER_PROCESS: UMA_HISTOGRAM_MEMORY_KB("Memory.NativeClient", sample); break; + case ChildProcessInfo::NACL_BROKER_PROCESS: + UMA_HISTOGRAM_MEMORY_KB("Memory.NativeClientBroker", sample); + break; default: NOTREACHED(); } diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc index 65140b3..c7fb40b 100644 --- a/chrome/browser/memory_details_win.cc +++ b/chrome/browser/memory_details_win.cc @@ -20,6 +20,7 @@ // Known browsers which we collect details for. enum { CHROME_BROWSER = 0, + CHROME_NACL_PROCESS, IE_BROWSER, FIREFOX_BROWSER, OPERA_BROWSER, @@ -38,6 +39,7 @@ MemoryDetails::MemoryDetails() { l10n_util::GetString(IDS_PRODUCT_NAME); ProcessData g_process_template[MAX_BROWSERS] = { { google_browser_name.c_str(), L"chrome.exe", }, + { google_browser_name.c_str(), L"nacl64.exe", }, { L"IE", L"iexplore.exe", }, { L"Firefox", L"firefox.exe", }, { L"Opera", L"opera.exe", }, @@ -117,7 +119,7 @@ void MemoryDetails::CollectProcessData( // Get Version Information. TCHAR name[MAX_PATH]; - if (index2 == CHROME_BROWSER) { + if (index2 == CHROME_BROWSER || index2 == CHROME_NACL_PROCESS) { scoped_ptr<FileVersionInfo> version_info( FileVersionInfo::CreateFileVersionInfoForCurrentModule()); if (version_info != NULL) @@ -142,7 +144,12 @@ void MemoryDetails::CollectProcessData( } // Add the process info to our list. - process_data_[index2].processes.push_back(info); + if (index2 == CHROME_NACL_PROCESS) { + // Add NaCl processes to Chrome's list + process_data_[CHROME_BROWSER].processes.push_back(info); + } else { + process_data_[index2].processes.push_back(info); + } break; } } while (::Process32Next(snapshot, &process_entry)); |