content/browser/service_worker/service_worker_info.h - Issue 501453002: Decouple script_url from ServiceWorkerRegistration

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

Issue 501453002: Decouple script_url from ServiceWorkerRegistration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sync after major collision Created 6 years, 4 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:

Index: content/browser/service_worker/service_worker_info.h

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

index 3d9b918132b8c6677471b64e6e3c125d67d75279..6fc2eef1c5d46d6af93e1921228d901244a5565f 100644

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

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

@@ -18,6 +18,7 @@ class CONTENT_EXPORT ServiceWorkerVersionInfo {

ServiceWorkerVersionInfo();

ServiceWorkerVersionInfo(ServiceWorkerVersion::RunningStatus running_status,

ServiceWorkerVersion::Status status,

+ const GURL& script_url,

int64 version_id,

int process_id,

int thread_id,

@@ -27,6 +28,7 @@ class CONTENT_EXPORT ServiceWorkerVersionInfo {

bool is_null;

ServiceWorkerVersion::RunningStatus running_status;

ServiceWorkerVersion::Status status;

+ GURL script_url;

int64 version_id;

int process_id;

int thread_id;

@@ -37,7 +39,6 @@ class CONTENT_EXPORT ServiceWorkerRegistrationInfo {

public:

ServiceWorkerRegistrationInfo();

ServiceWorkerRegistrationInfo(

- const GURL& script_url,

const GURL& pattern,

int64 registration_id,

const ServiceWorkerVersionInfo& active_version,

@@ -45,7 +46,6 @@ class CONTENT_EXPORT ServiceWorkerRegistrationInfo {

const ServiceWorkerVersionInfo& installing_version);

~ServiceWorkerRegistrationInfo();

- GURL script_url;

GURL pattern;

int64 registration_id;

ServiceWorkerVersionInfo controlling_version;