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

Unified Diff: content/child/child_thread_impl.cc

Issue 1332583002: Architecture for cross-process memory notification suppressing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comment explaining the use of scoped_ptr in the browser test matcher Created 5 years, 3 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/child/child_thread_impl.cc
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
index bfb1f3a21bf3d4fe20fd40242e37debfd6673457..51c1bb28e6c9456251be4607e0aeb625355bbdc7 100644
--- a/content/child/child_thread_impl.cc
+++ b/content/child/child_thread_impl.cc
@@ -39,6 +39,7 @@
#include "content/child/fileapi/file_system_dispatcher.h"
#include "content/child/fileapi/webfilesystem_impl.h"
#include "content/child/geofencing/geofencing_message_filter.h"
+#include "content/child/memory/child_memory_message_filter.h"
#include "content/child/mojo/mojo_application.h"
#include "content/child/notifications/notification_dispatcher.h"
#include "content/child/power_monitor_broadcast_source.h"
@@ -434,10 +435,11 @@ void ChildThreadImpl::Init(const Options& options) {
channel_->AddFilter(geofencing_message_filter_->GetFilter());
if (!IsInBrowserProcess()) {
- // In single process mode, browser-side tracing will cover the whole
- // process including renderers.
+ // In single process mode, browser-side tracing and memory will cover the
+ // whole process including renderers.
channel_->AddFilter(new tracing::ChildTraceMessageFilter(
ChildProcess::current()->io_task_runner()));
+ channel_->AddFilter(new ChildMemoryMessageFilter());
}
// In single process mode we may already have a power monitor
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/child/memory/child_memory_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698