diff options
| -rw-r--r-- | chrome/app/generated_resources.grd | 4 | ||||
| -rw-r--r-- | chrome/browser/memory_details.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/nacl_process_host.cc | 2 | ||||
| -rw-r--r-- | chrome/common/child_process_info.cc | 4 |
4 files changed, 13 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 912e464..9c38f3f 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -2514,6 +2514,10 @@ each locale. --> <message name="IDS_TASK_MANAGER_PROFILE_IMPORT_PREFIX" desc="The prefix for a profile import process row"> Profile Import: </message> + <message name="IDS_TASK_MANAGER_NACL_PREFIX" desc="The prefix for a Task Manager Native Client module row"> + Native Client module: <ph name="NEXE_NAME">$1<ex>Unknown Native Client module</ex></ph> + </message> + <!-- Extension Crashed Info Bar--> <message name="IDS_EXTENSION_CRASHED_INFOBAR_RESTART_BUTTON" desc="Title of the reload button in the extension crashed infobar. After the button is clicked, the extension will be reloaded."> diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc index 72d47fd..d96afdc 100644 --- a/chrome/browser/memory_details.cc +++ b/chrome/browser/memory_details.cc @@ -206,6 +206,9 @@ void MemoryDetails::UpdateHistograms() { case ChildProcessInfo::SANDBOX_HELPER_PROCESS: UMA_HISTOGRAM_MEMORY_KB("Memory.SandboxHelper", sample); break; + case ChildProcessInfo::NACL_PROCESS: + UMA_HISTOGRAM_MEMORY_KB("Memory.NativeClient", sample); + break; default: NOTREACHED(); } diff --git a/chrome/browser/nacl_process_host.cc b/chrome/browser/nacl_process_host.cc index 22fb446..fa9e961 100644 --- a/chrome/browser/nacl_process_host.cc +++ b/chrome/browser/nacl_process_host.cc @@ -34,6 +34,8 @@ NaClProcessHost::NaClProcessHost( ResourceDispatcherHost *resource_dispatcher_host) : ChildProcessHost(NACL_PROCESS, resource_dispatcher_host), resource_dispatcher_host_(resource_dispatcher_host) { + // TODO(gregoryd): fix this to include the nexe name. + set_name(L"nexe name should appear here"); } bool NaClProcessHost::Launch(ResourceMessageFilter* renderer_msg_filter, diff --git a/chrome/common/child_process_info.cc b/chrome/common/child_process_info.cc index 71886f7..4eafde8 100644 --- a/chrome/common/child_process_info.cc +++ b/chrome/common/child_process_info.cc @@ -54,6 +54,8 @@ std::wstring ChildProcessInfo::GetTypeNameInEnglish( return L"Zygote"; case SANDBOX_HELPER_PROCESS: return L"Sandbox helper"; + case NACL_PROCESS: + return L"Native Client module"; case UNKNOWN_PROCESS: default: DCHECK(false) << "Unknown child process type!"; @@ -75,6 +77,8 @@ std::wstring ChildProcessInfo::GetLocalizedTitle() const { message_id = IDS_TASK_MANAGER_UTILITY_PREFIX; } else if (type_ == ChildProcessInfo::PROFILE_IMPORT_PROCESS) { message_id = IDS_TASK_MANAGER_PROFILE_IMPORT_PREFIX; + } else if (type_ == ChildProcessInfo::NACL_PROCESS) { + message_id = IDS_TASK_MANAGER_NACL_PREFIX; } else { DCHECK(false) << "Need localized name for child process type."; return title; |