Chromium Code Reviews| Index: content/browser/service_worker/service_worker_context_wrapper.cc |
| diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc |
| index 2ccffa1f2202225b0791495d26f3a831ecd685e0..8fb0ca87f7bc5a77b2ce12ad22279f85478c4cb4 100644 |
| --- a/content/browser/service_worker/service_worker_context_wrapper.cc |
| +++ b/content/browser/service_worker/service_worker_context_wrapper.cc |
| @@ -14,7 +14,10 @@ namespace content { |
| ServiceWorkerContextWrapper::ServiceWorkerContextWrapper() |
| : observer_list_( |
| - new ObserverListThreadSafe<ServiceWorkerContextObserver>()) {} |
| + new ObserverListThreadSafe<ServiceWorkerContextObserver>()), |
| + callback_proxy_(new CallbackProxy()) { |
| + observer_list_->AddObserver(callback_proxy_); |
| +} |
| ServiceWorkerContextWrapper::~ServiceWorkerContextWrapper() { |
|
michaeln
2014/04/25 22:09:14
I think you have to observer_list_->RemoveObserver
horo
2014/04/26 08:00:45
Done.
|
| } |
| @@ -121,6 +124,13 @@ void ServiceWorkerContextWrapper::UnregisterServiceWorker( |
| base::Bind(&FinishUnregistrationOnIO, continuation)); |
| } |
| +scoped_ptr<base::CallbackList<void(void)>::Subscription> |
| +ServiceWorkerContextWrapper::RegisterStatusChangeCallback( |
| + const base::Callback<void(void)>& callback) { |
| + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| + return callback_proxy_->Add(callback); |
| +} |
| + |
| void ServiceWorkerContextWrapper::AddObserver( |
| ServiceWorkerContextObserver* observer) { |
| observer_list_->AddObserver(observer); |
| @@ -131,4 +141,45 @@ void ServiceWorkerContextWrapper::RemoveObserver( |
| observer_list_->RemoveObserver(observer); |
| } |
| +void ServiceWorkerContextWrapper::GetRunningServiceWorkerInfo( |
| + const GetRunningServiceWorkerInfoCallback& callback) { |
| + // TODO(horo): Implement this. |
| +} |
| + |
| +scoped_ptr<base::CallbackList<void(void)>::Subscription> |
| +ServiceWorkerContextWrapper::CallbackProxy::Add( |
| + const base::Callback<void(void)>& callback) { |
| + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| + return status_change_callback_list_.Add(callback); |
| +} |
| + |
| +void ServiceWorkerContextWrapper::CallbackProxy::OnWorkerStarted( |
| + int64 version_id, |
| + int process_id, |
| + int thread_id) { |
| + BrowserThread::PostTask(BrowserThread::UI, |
|
michaeln
2014/04/25 22:09:14
If I understand ObserverListThreadSafe properly, s
horo
2014/04/26 08:00:45
Done.
|
| + FROM_HERE, |
| + base::Bind(&CallbackProxy::onStatusChanged, this)); |
| +} |
| + |
| +void ServiceWorkerContextWrapper::CallbackProxy::OnWorkerStopped( |
| + int64 version_id, |
| + int process_id, |
| + int thread_id) { |
| + BrowserThread::PostTask(BrowserThread::UI, |
| + FROM_HERE, |
| + base::Bind(&CallbackProxy::onStatusChanged, this)); |
| +} |
| + |
| +void ServiceWorkerContextWrapper::CallbackProxy::OnVersionStateChanged( |
| + int64 version_id) { |
| + BrowserThread::PostTask(BrowserThread::UI, |
| + FROM_HERE, |
| + base::Bind(&CallbackProxy::onStatusChanged, this)); |
| +} |
| + |
| +void ServiceWorkerContextWrapper::CallbackProxy::onStatusChanged() { |
| + status_change_callback_list_.Notify(); |
| +} |
| + |
| } // namespace content |