diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-25 19:40:10 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-12-03 13:52:53 +0000 |
| commit | 4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7 (patch) | |
| tree | 938665d93a11fe7a6d0124e3c1e020d1f9d3f947 /chrome/common/child_process_info.cc | |
| parent | 7c627d87728a355737862918d144f98f69406954 (diff) | |
| download | external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.zip external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.gz external_chromium-4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7.tar.bz2 | |
Merge Chromium at r66597: Initial merge by git.
Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
Diffstat (limited to 'chrome/common/child_process_info.cc')
| -rw-r--r-- | chrome/common/child_process_info.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/common/child_process_info.cc b/chrome/common/child_process_info.cc index bd94ff2..1af0cdb 100644 --- a/chrome/common/child_process_info.cc +++ b/chrome/common/child_process_info.cc @@ -64,6 +64,8 @@ std::string ChildProcessInfo::GetTypeNameInEnglish( return "Native Client broker"; case GPU_PROCESS: return "GPU"; + case PPAPI_PLUGIN_PROCESS: + return "Pepper Plugin"; case UNKNOWN_PROCESS: default: DCHECK(false) << "Unknown child process type!"; @@ -96,6 +98,7 @@ string16 ChildProcessInfo::GetLocalizedTitle() const { return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NACL_BROKER_PREFIX); case ChildProcessInfo::PLUGIN_PROCESS: + case ChildProcessInfo::PPAPI_PLUGIN_PROCESS: return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_PLUGIN_PREFIX, title, WideToUTF16Hack(version_)); |