Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_context_wrapper.h" | 5 #include "content/browser/service_worker/service_worker_context_wrapper.h" |
| 6 | 6 |
| 7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #include "content/browser/service_worker/service_worker_context_core.h" | 8 #include "content/browser/service_worker/service_worker_context_core.h" |
| 9 #include "content/browser/service_worker/service_worker_context_observer.h" | 9 #include "content/browser/service_worker/service_worker_context_observer.h" |
| 10 #include "content/public/browser/browser_thread.h" | 10 #include "content/public/browser/browser_thread.h" |
| 11 #include "webkit/browser/quota/quota_manager_proxy.h" | 11 #include "webkit/browser/quota/quota_manager_proxy.h" |
| 12 | 12 |
| 13 namespace content { | 13 namespace content { |
| 14 | 14 |
| 15 ServiceWorkerContextWrapper::ServiceWorkerContextWrapper() | 15 ServiceWorkerContextWrapper::ServiceWorkerContextWrapper() |
| 16 : observer_list_( | 16 : observer_list_( |
| 17 new ObserverListThreadSafe<ServiceWorkerContextObserver>()) {} | 17 new ObserverListThreadSafe<ServiceWorkerContextObserver>()), |
| 18 callback_proxy_(new CallbackProxy()) { | |
| 19 observer_list_->AddObserver(callback_proxy_); | |
| 20 } | |
| 18 | 21 |
| 19 ServiceWorkerContextWrapper::~ServiceWorkerContextWrapper() { | 22 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.
| |
| 20 } | 23 } |
| 21 | 24 |
| 22 void ServiceWorkerContextWrapper::Init( | 25 void ServiceWorkerContextWrapper::Init( |
| 23 const base::FilePath& user_data_directory, | 26 const base::FilePath& user_data_directory, |
| 24 quota::QuotaManagerProxy* quota_manager_proxy) { | 27 quota::QuotaManagerProxy* quota_manager_proxy) { |
| 25 if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) { | 28 if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) { |
| 26 BrowserThread::PostTask( | 29 BrowserThread::PostTask( |
| 27 BrowserThread::IO, FROM_HERE, | 30 BrowserThread::IO, FROM_HERE, |
| 28 base::Bind(&ServiceWorkerContextWrapper::Init, this, | 31 base::Bind(&ServiceWorkerContextWrapper::Init, this, |
| 29 user_data_directory, | 32 user_data_directory, |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 114 return; | 117 return; |
| 115 } | 118 } |
| 116 | 119 |
| 117 context()->UnregisterServiceWorker( | 120 context()->UnregisterServiceWorker( |
| 118 pattern, | 121 pattern, |
| 119 source_process_id, | 122 source_process_id, |
| 120 NULL /* provider_host */, | 123 NULL /* provider_host */, |
| 121 base::Bind(&FinishUnregistrationOnIO, continuation)); | 124 base::Bind(&FinishUnregistrationOnIO, continuation)); |
| 122 } | 125 } |
| 123 | 126 |
| 127 scoped_ptr<base::CallbackList<void(void)>::Subscription> | |
| 128 ServiceWorkerContextWrapper::RegisterStatusChangeCallback( | |
| 129 const base::Callback<void(void)>& callback) { | |
| 130 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | |
| 131 return callback_proxy_->Add(callback); | |
| 132 } | |
| 133 | |
| 124 void ServiceWorkerContextWrapper::AddObserver( | 134 void ServiceWorkerContextWrapper::AddObserver( |
| 125 ServiceWorkerContextObserver* observer) { | 135 ServiceWorkerContextObserver* observer) { |
| 126 observer_list_->AddObserver(observer); | 136 observer_list_->AddObserver(observer); |
| 127 } | 137 } |
| 128 | 138 |
| 129 void ServiceWorkerContextWrapper::RemoveObserver( | 139 void ServiceWorkerContextWrapper::RemoveObserver( |
| 130 ServiceWorkerContextObserver* observer) { | 140 ServiceWorkerContextObserver* observer) { |
| 131 observer_list_->RemoveObserver(observer); | 141 observer_list_->RemoveObserver(observer); |
| 132 } | 142 } |
| 133 | 143 |
| 144 void ServiceWorkerContextWrapper::GetRunningServiceWorkerInfo( | |
| 145 const GetRunningServiceWorkerInfoCallback& callback) { | |
| 146 // TODO(horo): Implement this. | |
| 147 } | |
| 148 | |
| 149 scoped_ptr<base::CallbackList<void(void)>::Subscription> | |
| 150 ServiceWorkerContextWrapper::CallbackProxy::Add( | |
| 151 const base::Callback<void(void)>& callback) { | |
| 152 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | |
| 153 return status_change_callback_list_.Add(callback); | |
| 154 } | |
| 155 | |
| 156 void ServiceWorkerContextWrapper::CallbackProxy::OnWorkerStarted( | |
| 157 int64 version_id, | |
| 158 int process_id, | |
| 159 int thread_id) { | |
| 160 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.
| |
| 161 FROM_HERE, | |
| 162 base::Bind(&CallbackProxy::onStatusChanged, this)); | |
| 163 } | |
| 164 | |
| 165 void ServiceWorkerContextWrapper::CallbackProxy::OnWorkerStopped( | |
| 166 int64 version_id, | |
| 167 int process_id, | |
| 168 int thread_id) { | |
| 169 BrowserThread::PostTask(BrowserThread::UI, | |
| 170 FROM_HERE, | |
| 171 base::Bind(&CallbackProxy::onStatusChanged, this)); | |
| 172 } | |
| 173 | |
| 174 void ServiceWorkerContextWrapper::CallbackProxy::OnVersionStateChanged( | |
| 175 int64 version_id) { | |
| 176 BrowserThread::PostTask(BrowserThread::UI, | |
| 177 FROM_HERE, | |
| 178 base::Bind(&CallbackProxy::onStatusChanged, this)); | |
| 179 } | |
| 180 | |
| 181 void ServiceWorkerContextWrapper::CallbackProxy::onStatusChanged() { | |
| 182 status_change_callback_list_.Notify(); | |
| 183 } | |
| 184 | |
| 134 } // namespace content | 185 } // namespace content |
| OLD | NEW |