Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(414)

Unified Diff: content/browser/utility_process_host_impl.cc

Issue 972083002: Report utility process JS memory in task manager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@v8-pac-oop
Patch Set: Try to fix build... again. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/utility_process_host_impl.cc
diff --git a/content/browser/utility_process_host_impl.cc b/content/browser/utility_process_host_impl.cc
index f6b43bec6aadfa9eb37838196a9c5808b8a6492e..8f5743f5be85027b67783b2ebb3f4637bebaacae 100644
--- a/content/browser/utility_process_host_impl.cc
+++ b/content/browser/utility_process_host_impl.cc
@@ -21,6 +21,7 @@
#include "content/browser/renderer_host/render_process_host_impl.h"
#include "content/common/child_process_host_impl.h"
#include "content/common/in_process_child_thread_params.h"
+#include "content/common/mojo/service_registry_impl.h"
#include "content/common/utility_messages.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/content_browser_client.h"
@@ -208,6 +209,10 @@ bool UtilityProcessHostImpl::StartProcess() {
// launches a UtilityProcessHost.
process_.reset(new BrowserChildProcessHostImpl(PROCESS_TYPE_UTILITY, this));
process_->SetName(name_);
+ if (mojo_application_host_) {
+ process_->SetServiceRegistry(
+ static_cast<ServiceRegistryImpl*>(GetServiceRegistry())->GetWeakPtr());
jam 2015/05/12 16:12:23 usually the pattern is that the delegate returns s
Anand Mistry (off Chromium) 2015/05/13 00:42:11 Done.
+ }
std::string channel_id = process_->GetHost()->CreateChannel();
if (channel_id.empty())

Powered by Google App Engine
This is Rietveld 408576698