content/child/service_worker/service_worker_dispatcher.h - Issue 1181973004: ServiceWorker: Route unregister() through WebServiceWorkerRegistration for refactoring (2)

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/child/service_worker/service_worker_dispatcher.h

Issue 1181973004: ServiceWorker: Route unregister() through WebServiceWorkerRegistration for refactoring (2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove ifdef Created 5 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/service_worker_dispatcher_host_unittest.cc ('k') | content/child/service_worker/service_worker_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/child/service_worker/service_worker_dispatcher.h

diff --git a/content/child/service_worker/service_worker_dispatcher.h b/content/child/service_worker/service_worker_dispatcher.h

index 4f33a600b4237e570dd1c9e68672f7c5e34482a5..ac573ca5cb50a2e5441844cd8ca63c9b99b1d13e 100644

--- a/content/child/service_worker/service_worker_dispatcher.h

+++ b/content/child/service_worker/service_worker_dispatcher.h

@@ -46,8 +46,7 @@ class CONTENT_EXPORT ServiceWorkerDispatcher

public:

typedef blink::WebServiceWorkerProvider::WebServiceWorkerRegistrationCallbacks

WebServiceWorkerRegistrationCallbacks;

- typedef

- blink::WebServiceWorkerProvider::WebServiceWorkerUnregistrationCallbacks

+ typedef blink::WebCallbacks<bool, blink::WebServiceWorkerError>

WebServiceWorkerUnregistrationCallbacks;

typedef

blink::WebServiceWorkerProvider::WebServiceWorkerGetRegistrationCallbacks

@@ -74,10 +73,16 @@ class CONTENT_EXPORT ServiceWorkerDispatcher

// Corresponds to ServiceWorkerRegistration.update().

void UpdateServiceWorker(int provider_id, int64 registration_id);

// Corresponds to ServiceWorkerRegistration.unregister().

- void UnregisterServiceWorker(

+ // TODO(nhiroki): Remove a deprecated version after http://crbug.com/500404 is

+ // fixed.

+ void DeprecatedUnregisterServiceWorker(

int provider_id,

const GURL& pattern,

WebServiceWorkerUnregistrationCallbacks* callbacks);

+ void UnregisterServiceWorker(

+ int provider_id,

+ int64 registration_id,

+ WebServiceWorkerUnregistrationCallbacks* callbacks);

// Corresponds to navigator.serviceWorker.getRegistration().

void GetRegistration(

int provider_id,