diff options
author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-13 21:15:29 +0000 |
---|---|---|
committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-13 21:15:29 +0000 |
commit | 38a0aea9fe83abeee258fced39da7be6253a9aa4 (patch) | |
tree | d1f7f43cfaeca2eca268b92e6458f9361d4a9345 /chrome | |
parent | b96117ce4792699d2192344784f1fb35f8c53400 (diff) | |
download | chromium_src-38a0aea9fe83abeee258fced39da7be6253a9aa4.zip chromium_src-38a0aea9fe83abeee258fced39da7be6253a9aa4.tar.gz chromium_src-38a0aea9fe83abeee258fced39da7be6253a9aa4.tar.bz2 |
Revert 28875 - Adding support for Native Client in Chrome's task manager and "stats for nerds" screen.
TEST=none
BUG=http://code.google.com/p/nativeclient/issues/detail?id=108
Review URL: http://codereview.chromium.org/267043
TBR=gregoryd@google.com
Review URL: http://codereview.chromium.org/266067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28888 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-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, 0 insertions, 13 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 9c38f3f..912e464 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -2514,10 +2514,6 @@ 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 d96afdc..72d47fd 100644 --- a/chrome/browser/memory_details.cc +++ b/chrome/browser/memory_details.cc @@ -206,9 +206,6 @@ 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 fa9e961..22fb446 100644 --- a/chrome/browser/nacl_process_host.cc +++ b/chrome/browser/nacl_process_host.cc @@ -34,8 +34,6 @@ 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 4eafde8..71886f7 100644 --- a/chrome/common/child_process_info.cc +++ b/chrome/common/child_process_info.cc @@ -54,8 +54,6 @@ 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!"; @@ -77,8 +75,6 @@ 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; |