content/browser/service_worker/service_worker_version.h - Issue 2106693002: Convert EmbeddedWorker to InterfaceRegistry/Provider.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/service_worker/service_worker_version.h

Issue 2106693002: Convert EmbeddedWorker to InterfaceRegistry/Provider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 4 years, 6 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/browser/service_worker/embedded_worker_test_helper.cc ('k') | content/browser/service_worker/service_worker_version_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_version.h

diff --git a/content/browser/service_worker/service_worker_version.h b/content/browser/service_worker/service_worker_version.h

index 0ef0e80d9a21c432c8c975c48854fc6e9cf6f47f..a929a2655865d507e2f14786c714da6ffa26326c 100644

--- a/content/browser/service_worker/service_worker_version.h

+++ b/content/browser/service_worker/service_worker_version.h

@@ -32,8 +32,8 @@

#include "content/common/content_export.h"

#include "content/common/service_worker/service_worker_status_code.h"

#include "content/common/service_worker/service_worker_types.h"

-#include "content/public/common/service_registry.h"

#include "ipc/ipc_message.h"

+#include "services/shell/public/cpp/interface_provider.h"

#include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerEventResult.h"

#include "url/gurl.h"

#include "url/origin.h"

@@ -694,8 +694,7 @@ base::WeakPtr<Interface> ServiceWorkerVersion::GetMojoServiceForRequest(

mojo_services_.get(Interface::Name_));

if (!service) {

mojo::InterfacePtr<Interface> interface;

- embedded_worker_->GetServiceRegistry()->ConnectToRemoteService(

- mojo::GetProxy(&interface));

+ embedded_worker_->GetRemoteInterfaces()->GetInterface(&interface);

interface.set_connection_error_handler(

base::Bind(&ServiceWorkerVersion::OnMojoConnectionError,

weak_factory_.GetWeakPtr(), Interface::Name_));