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

Unified Diff: content/child/child_thread.cc

Issue 25008006: Flush out initial [un]registerServiceWorker roundtrip (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use int64 for workers, remove policy check Created 7 years, 2 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.cc
diff --git a/content/child/child_thread.cc b/content/child/child_thread.cc
index 95b36c6dcff26f4482ce3818ae4dfcc5179cdbe5..bd532a3c28f8579a6f3c798842d89cc885de0cfc 100644
--- a/content/child/child_thread.cc
+++ b/content/child/child_thread.cc
@@ -4,6 +4,8 @@
#include "content/child/child_thread.h"
+#include <string>
+
#include "base/allocator/allocator_extension.h"
#include "base/base_switches.h"
#include "base/command_line.h"
@@ -25,6 +27,8 @@
#include "content/child/quota_dispatcher.h"
#include "content/child/quota_message_filter.h"
#include "content/child/resource_dispatcher.h"
+#include "content/child/service_worker/service_worker_dispatcher.h"
+#include "content/child/service_worker/service_worker_message_filter.h"
#include "content/child/socket_stream_dispatcher.h"
#include "content/child/thread_safe_sender.h"
#include "content/child/websocket_dispatcher.h"
@@ -180,6 +184,11 @@ void ChildThread::Init() {
resource_message_filter_ =
new ChildResourceMessageFilter(resource_dispatcher());
+ service_worker_message_filter_ =
+ new ServiceWorkerMessageFilter(thread_safe_sender_.get());
+ service_worker_dispatcher_.reset(new ServiceWorkerDispatcher(
+ thread_safe_sender_.get()));
+
quota_message_filter_ =
new QuotaMessageFilter(thread_safe_sender_.get());
quota_dispatcher_.reset(new QuotaDispatcher(thread_safe_sender_.get(),
@@ -191,6 +200,7 @@ void ChildThread::Init() {
ChildProcess::current()->io_message_loop_proxy()));
channel_->AddFilter(resource_message_filter_.get());
channel_->AddFilter(quota_message_filter_.get());
+ channel_->AddFilter(service_worker_message_filter_.get());
// In single process mode we may already have a power monitor
if (!base::PowerMonitor::Get()) {
@@ -253,6 +263,7 @@ ChildThread::~ChildThread() {
#endif
channel_->RemoveFilter(quota_message_filter_.get());
+ channel_->RemoveFilter(service_worker_message_filter_.get());
channel_->RemoveFilter(histogram_message_filter_.get());
channel_->RemoveFilter(sync_message_filter_.get());

Powered by Google App Engine
This is Rietveld 408576698