summaryrefslogtreecommitdiffstats
path: root/chrome/common/child_process_info.cc
diff options
context:
space:
mode:
authorgregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-17 22:40:52 +0000
committergregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-17 22:40:52 +0000
commitaef8d5ae72f5da1a2668d9c2bac4596d4c6f0266 (patch)
treef40ef2624dc3f18385c4eebd14c4d42da3690149 /chrome/common/child_process_info.cc
parentd7b4cc7de3c097014cd3850bc6e01e2e5d69d657 (diff)
downloadchromium_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/common/child_process_info.cc')
-rw-r--r--chrome/common/child_process_info.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/common/child_process_info.cc b/chrome/common/child_process_info.cc
index 473512f..74b362e 100644
--- a/chrome/common/child_process_info.cc
+++ b/chrome/common/child_process_info.cc
@@ -56,6 +56,8 @@ std::wstring ChildProcessInfo::GetTypeNameInEnglish(
return L"Sandbox helper";
case NACL_LOADER_PROCESS:
return L"Native Client module";
+ case NACL_BROKER_PROCESS:
+ return L"Native Client broker";
case UNKNOWN_PROCESS:
default:
DCHECK(false) << "Unknown child process type!";
@@ -79,6 +81,8 @@ std::wstring ChildProcessInfo::GetLocalizedTitle() const {
message_id = IDS_TASK_MANAGER_PROFILE_IMPORT_PREFIX;
} else if (type_ == ChildProcessInfo::NACL_LOADER_PROCESS) {
message_id = IDS_TASK_MANAGER_NACL_PREFIX;
+ } else if (type_ == ChildProcessInfo::NACL_BROKER_PROCESS) {
+ message_id = IDS_TASK_MANAGER_NACL_BROKER_PREFIX;
} else {
DCHECK(false) << "Need localized name for child process type.";
return title;