Chromium Code Reviews| Index: content/browser/service_worker/service_worker_registration.cc |
| diff --git a/content/browser/service_worker/service_worker_registration.cc b/content/browser/service_worker/service_worker_registration.cc |
| index e3a7e9597b40c9bddd14ccff7280eefea8818033..b24ce1fe963605e82758214d2bd0ea8b5c6ce805 100644 |
| --- a/content/browser/service_worker/service_worker_registration.cc |
| +++ b/content/browser/service_worker/service_worker_registration.cc |
| @@ -4,6 +4,7 @@ |
| #include "content/browser/service_worker/service_worker_registration.h" |
| +#include "content/browser/service_worker/service_worker_info.h" |
| #include "content/public/browser/browser_thread.h" |
| namespace content { |
| @@ -35,6 +36,16 @@ void ServiceWorkerRegistration::Shutdown() { |
| is_shutdown_ = true; |
| } |
| +ServiceWorkerRegistrationInfo ServiceWorkerRegistration::GetInfo() { |
| + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| + return ServiceWorkerRegistrationInfo( |
| + script_url(), |
| + pattern(), |
| + active_version_ ? active_version_->GetInfo() : ServiceWorkerVersionInfo(), |
|
michaeln
2014/03/06 23:31:49
nit: i know it fits, but it might be better to wra
alecflett
2014/03/06 23:46:47
I'm just using 'git cl format' to get rid of forma
|
| + pending_version_ ? pending_version_->GetInfo() |
| + : ServiceWorkerVersionInfo()); |
| +} |
| + |
| void ServiceWorkerRegistration::ActivatePendingVersion() { |
| active_version_->Shutdown(); |
| active_version_ = pending_version_; |