summaryrefslogtreecommitdiffstats
path: root/chrome/browser/memory_details_mac.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/memory_details_mac.cc')
-rw-r--r--chrome/browser/memory_details_mac.cc19
1 files changed, 16 insertions, 3 deletions
diff --git a/chrome/browser/memory_details_mac.cc b/chrome/browser/memory_details_mac.cc
index c03c8c9..037d527 100644
--- a/chrome/browser/memory_details_mac.cc
+++ b/chrome/browser/memory_details_mac.cc
@@ -113,11 +113,24 @@ void MemoryDetails::CollectProcessData(
}
}
+ // The helper might show up as these different flavors depending on the
+ // executable flags required.
+ std::vector<std::string> helper_names;
+ helper_names.push_back(chrome::kHelperProcessExecutableName);
+ for (const char* const* suffix = chrome::kHelperFlavorSuffixes;
+ *suffix;
+ ++suffix) {
+ std::string helper_name = chrome::kHelperProcessExecutableName;
+ helper_name.append(1, ' ');
+ helper_name.append(*suffix);
+ helper_names.push_back(helper_name);
+ }
+
// Get PIDs of helpers.
std::vector<base::ProcessId> helper_pids;
- {
- base::NamedProcessIterator helper_it(chrome::kHelperProcessExecutableName,
- NULL);
+ for (size_t i = 0; i < helper_names.size(); ++i) {
+ std::string helper_name = helper_names[i];
+ base::NamedProcessIterator helper_it(helper_name, NULL);
while (const base::ProcessEntry* entry = helper_it.NextProcessEntry()) {
helper_pids.push_back(entry->pid());
all_pids.push_back(entry->pid());