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

Side by Side Diff: content/browser/service_worker/service_worker_info.cc

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, 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "content/browser/service_worker/service_worker_info.h" 5 #include "content/browser/service_worker/service_worker_info.h"
6 6
7 #include "content/common/service_worker/service_worker_types.h" 7 #include "content/common/service_worker/service_worker_types.h"
8 #include "ipc/ipc_message.h" 8 #include "ipc/ipc_message.h"
9 9
10 namespace content { 10 namespace content {
11 11
12 ServiceWorkerVersionInfo::ServiceWorkerVersionInfo() 12 ServiceWorkerVersionInfo::ServiceWorkerVersionInfo()
13 : is_null(true), 13 : is_null(true),
14 running_status(ServiceWorkerVersion::STOPPED), 14 running_status(ServiceWorkerVersion::STOPPED),
15 status(ServiceWorkerVersion::NEW), 15 status(ServiceWorkerVersion::NEW),
16 version_id(kInvalidServiceWorkerVersionId), 16 version_id(kInvalidServiceWorkerVersionId),
17 process_id(-1), 17 process_id(-1),
18 thread_id(-1), 18 thread_id(-1),
19 devtools_agent_route_id(MSG_ROUTING_NONE) { 19 devtools_agent_route_id(MSG_ROUTING_NONE) {
20 } 20 }
21 21
22 ServiceWorkerVersionInfo::ServiceWorkerVersionInfo( 22 ServiceWorkerVersionInfo::ServiceWorkerVersionInfo(
23 ServiceWorkerVersion::RunningStatus running_status, 23 ServiceWorkerVersion::RunningStatus running_status,
24 ServiceWorkerVersion::Status status, 24 ServiceWorkerVersion::Status status,
25 const GURL& script_url,
25 int64 version_id, 26 int64 version_id,
26 int process_id, 27 int process_id,
27 int thread_id, 28 int thread_id,
28 int devtools_agent_route_id) 29 int devtools_agent_route_id)
29 : is_null(false), 30 : is_null(false),
30 running_status(running_status), 31 running_status(running_status),
31 status(status), 32 status(status),
33 script_url(script_url),
32 version_id(version_id), 34 version_id(version_id),
33 process_id(process_id), 35 process_id(process_id),
34 thread_id(thread_id), 36 thread_id(thread_id),
35 devtools_agent_route_id(devtools_agent_route_id) { 37 devtools_agent_route_id(devtools_agent_route_id) {
36 } 38 }
37 39
38 ServiceWorkerVersionInfo::~ServiceWorkerVersionInfo() {} 40 ServiceWorkerVersionInfo::~ServiceWorkerVersionInfo() {}
39 41
40 ServiceWorkerRegistrationInfo::ServiceWorkerRegistrationInfo() {} 42 ServiceWorkerRegistrationInfo::ServiceWorkerRegistrationInfo() {}
41 43
42 ServiceWorkerRegistrationInfo::ServiceWorkerRegistrationInfo( 44 ServiceWorkerRegistrationInfo::ServiceWorkerRegistrationInfo(
43 const GURL& script_url,
44 const GURL& pattern, 45 const GURL& pattern,
45 int64 registration_id, 46 int64 registration_id,
46 const ServiceWorkerVersionInfo& active_version, 47 const ServiceWorkerVersionInfo& active_version,
47 const ServiceWorkerVersionInfo& waiting_version, 48 const ServiceWorkerVersionInfo& waiting_version,
48 const ServiceWorkerVersionInfo& installing_version) 49 const ServiceWorkerVersionInfo& installing_version)
49 : script_url(script_url), 50 : pattern(pattern),
50 pattern(pattern),
51 registration_id(registration_id), 51 registration_id(registration_id),
52 active_version(active_version), 52 active_version(active_version),
53 waiting_version(waiting_version), 53 waiting_version(waiting_version),
54 installing_version(installing_version) { 54 installing_version(installing_version) {
55 } 55 }
56 56
57 ServiceWorkerRegistrationInfo::~ServiceWorkerRegistrationInfo() {} 57 ServiceWorkerRegistrationInfo::~ServiceWorkerRegistrationInfo() {}
58 58
59 } // namespace content 59 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/service_worker/service_worker_info.h ('k') | content/browser/service_worker/service_worker_internals_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698