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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 625533002: Respect content settings for Service Worker registration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@testing
Patch Set: better diff Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 822 matching lines...) Expand 10 before | Expand all | Expand 10 after
833 833
834 AddFilter( 834 AddFilter(
835 new WebSocketDispatcherHost(GetID(), websocket_request_context_callback)); 835 new WebSocketDispatcherHost(GetID(), websocket_request_context_callback));
836 836
837 message_port_message_filter_ = new MessagePortMessageFilter( 837 message_port_message_filter_ = new MessagePortMessageFilter(
838 base::Bind(&RenderWidgetHelper::GetNextRoutingID, 838 base::Bind(&RenderWidgetHelper::GetNextRoutingID,
839 base::Unretained(widget_helper_.get()))); 839 base::Unretained(widget_helper_.get())));
840 AddFilter(message_port_message_filter_.get()); 840 AddFilter(message_port_message_filter_.get());
841 841
842 scoped_refptr<ServiceWorkerDispatcherHost> service_worker_filter = 842 scoped_refptr<ServiceWorkerDispatcherHost> service_worker_filter =
843 new ServiceWorkerDispatcherHost(GetID(), 843 new ServiceWorkerDispatcherHost(
844 message_port_message_filter_.get()); 844 GetID(), message_port_message_filter_.get(), resource_context);
845 service_worker_filter->Init( 845 service_worker_filter->Init(
846 storage_partition_impl_->GetServiceWorkerContext()); 846 storage_partition_impl_->GetServiceWorkerContext());
847 AddFilter(service_worker_filter.get()); 847 AddFilter(service_worker_filter.get());
848 848
849 AddFilter(new SharedWorkerMessageFilter( 849 AddFilter(new SharedWorkerMessageFilter(
850 GetID(), 850 GetID(),
851 resource_context, 851 resource_context,
852 WorkerStoragePartition( 852 WorkerStoragePartition(
853 storage_partition_impl_->GetURLRequestContext(), 853 storage_partition_impl_->GetURLRequestContext(),
854 storage_partition_impl_->GetMediaURLRequestContext(), 854 storage_partition_impl_->GetMediaURLRequestContext(),
(...skipping 1392 matching lines...) Expand 10 before | Expand all | Expand 10 after
2247 if (worker_ref_count_ == 0) 2247 if (worker_ref_count_ == 0)
2248 Cleanup(); 2248 Cleanup();
2249 } 2249 }
2250 2250
2251 void RenderProcessHostImpl::EnsureMojoActivated() { 2251 void RenderProcessHostImpl::EnsureMojoActivated() {
2252 mojo_activation_required_ = true; 2252 mojo_activation_required_ = true;
2253 MaybeActivateMojo(); 2253 MaybeActivateMojo();
2254 } 2254 }
2255 2255
2256 } // namespace content 2256 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698