content/browser/service_worker/service_worker_register_job.h - Issue 605163002: Service Worker: Remove legacy code for resolving register() to a version

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_register_job.h

Issue 605163002: Service Worker: Remove legacy code for resolving register() to a version (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: only resolve on active_version Created 6 years, 3 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_job_unittest.cc ('k') | content/browser/service_worker/service_worker_register_job.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_register_job.h

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

index c281ed2227ce917fa46a84a6943c99f5ca47df47..fa143e2340c06d1f03e9d8679d6504896e952e2a 100644

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

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

@@ -38,8 +38,7 @@ class ServiceWorkerRegisterJob : public ServiceWorkerRegisterJobBase,

public ServiceWorkerRegistration::Listener {

public:

typedef base::Callback<void(ServiceWorkerStatusCode status,

- ServiceWorkerRegistration* registration,

- ServiceWorkerVersion* version)>

+ ServiceWorkerRegistration* registration)>

RegistrationCallback;

// For registration jobs.

@@ -132,8 +131,7 @@ class ServiceWorkerRegisterJob : public ServiceWorkerRegisterJobBase,

void Complete(ServiceWorkerStatusCode status);

void CompleteInternal(ServiceWorkerStatusCode status);

void ResolvePromise(ServiceWorkerStatusCode status,

- ServiceWorkerRegistration* registration,

- ServiceWorkerVersion* version);

+ ServiceWorkerRegistration* registration);

// EmbeddedWorkerInstance::Listener override of OnPausedAfterDownload.

virtual void OnPausedAfterDownload() OVERRIDE;

@@ -144,7 +142,6 @@ class ServiceWorkerRegisterJob : public ServiceWorkerRegisterJobBase,

ServiceWorkerRegistration* registration) OVERRIDE;

void OnCompareScriptResourcesComplete(

- ServiceWorkerVersion* most_recent_version,

ServiceWorkerStatusCode status,

bool are_equal);

@@ -163,7 +160,6 @@ class ServiceWorkerRegisterJob : public ServiceWorkerRegisterJobBase,

bool is_promise_resolved_;

ServiceWorkerStatusCode promise_resolved_status_;

scoped_refptr<ServiceWorkerRegistration> promise_resolved_registration_;

- scoped_refptr<ServiceWorkerVersion> promise_resolved_version_;

base::WeakPtrFactory<ServiceWorkerRegisterJob> weak_factory_;

DISALLOW_COPY_AND_ASSIGN(ServiceWorkerRegisterJob);