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

Unified Diff: content/child/child_thread_impl.cc

Issue 2225133002: Revert "Port WebSockets to Mojo IPC" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « content/child/child_thread_impl.h ('k') | content/child/websocket_bridge.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/child_thread_impl.cc
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
index 6f7360358daae3d50a0eaaa168e18618227b1be3..e4e008bbd3282345456ea233ee7a93892d8008dc 100644
--- a/content/child/child_thread_impl.cc
+++ b/content/child/child_thread_impl.cc
@@ -49,6 +49,8 @@
#include "content/child/resource_dispatcher.h"
#include "content/child/service_worker/service_worker_message_filter.h"
#include "content/child/thread_safe_sender.h"
+#include "content/child/websocket_dispatcher.h"
+#include "content/child/websocket_message_filter.h"
#include "content/common/child_process_messages.h"
#include "content/common/in_process_child_thread_params.h"
#include "content/common/mojo/constants.h"
@@ -468,6 +470,7 @@ void ChildThreadImpl::Init(const Options& options) {
resource_dispatcher_.reset(new ResourceDispatcher(
this, message_loop()->task_runner()));
+ websocket_dispatcher_.reset(new WebSocketDispatcher);
file_system_dispatcher_.reset(new FileSystemDispatcher());
histogram_message_filter_ = new ChildHistogramMessageFilter();
@@ -485,12 +488,16 @@ void ChildThreadImpl::Init(const Options& options) {
new NotificationDispatcher(thread_safe_sender_.get());
push_dispatcher_ = new PushDispatcher(thread_safe_sender_.get());
+ websocket_message_filter_ =
+ new WebSocketMessageFilter(websocket_dispatcher_.get());
+
channel_->AddFilter(histogram_message_filter_.get());
channel_->AddFilter(resource_message_filter_.get());
channel_->AddFilter(quota_message_filter_->GetFilter());
channel_->AddFilter(notification_dispatcher_->GetFilter());
channel_->AddFilter(push_dispatcher_->GetFilter());
channel_->AddFilter(service_worker_message_filter_->GetFilter());
+ channel_->AddFilter(websocket_message_filter_.get());
if (!IsInBrowserProcess()) {
// In single process mode, browser-side tracing and memory will cover the
« no previous file with comments | « content/child/child_thread_impl.h ('k') | content/child/websocket_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698