summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorgregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 20:28:36 +0000
committergregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 20:28:36 +0000
commitbf2641b495ff36eee7bfbfd213d8fd2d22dd0ec6 (patch)
treeacdc3c2b6e28ac4a4ec0e8cc6218225e23fa34aa /chrome/browser
parent83a4075694df07811f995653615c8685bacef3ce (diff)
downloadchromium_src-bf2641b495ff36eee7bfbfd213d8fd2d22dd0ec6.zip
chromium_src-bf2641b495ff36eee7bfbfd213d8fd2d22dd0ec6.tar.gz
chromium_src-bf2641b495ff36eee7bfbfd213d8fd2d22dd0ec6.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/memory_details.cc3
-rw-r--r--chrome/browser/nacl_process_host.cc2
2 files changed, 5 insertions, 0 deletions
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,