| Index: content/child/service_worker/service_worker_dispatcher.h
|
| diff --git a/content/child/service_worker/service_worker_dispatcher.h b/content/child/service_worker/service_worker_dispatcher.h
|
| index 573e68e5ba89f82ea973097d76ea2de5fcc3125c..6b591be404ea43a7f317e2031aefca7a8bcc05ac 100644
|
| --- a/content/child/service_worker/service_worker_dispatcher.h
|
| +++ b/content/child/service_worker/service_worker_dispatcher.h
|
| @@ -39,6 +39,9 @@ class WebServiceWorkerImpl;
|
| // scripts through methods like navigator.registerServiceWorker().
|
| class ServiceWorkerDispatcher : public WorkerTaskRunner::Observer {
|
| public:
|
| + typedef blink::WebServiceWorkerProvider::WebServiceWorkerRegistrationCallbacks
|
| + WebServiceWorkerRegistrationCallbacks;
|
| +
|
| explicit ServiceWorkerDispatcher(ThreadSafeSender* thread_safe_sender);
|
| virtual ~ServiceWorkerDispatcher();
|
|
|
| @@ -50,12 +53,12 @@ class ServiceWorkerDispatcher : public WorkerTaskRunner::Observer {
|
| int provider_id,
|
| const GURL& pattern,
|
| const GURL& script_url,
|
| - blink::WebServiceWorkerProvider::WebServiceWorkerCallbacks* callbacks);
|
| + WebServiceWorkerRegistrationCallbacks* callbacks);
|
| // Corresponds to navigator.serviceWorker.unregister()
|
| void UnregisterServiceWorker(
|
| int provider_id,
|
| const GURL& pattern,
|
| - blink::WebServiceWorkerProvider::WebServiceWorkerCallbacks* callbacks);
|
| + WebServiceWorkerRegistrationCallbacks* callbacks);
|
|
|
| // Called when a new provider context for a document is created. Usually
|
| // this happens when a new document is being loaded, and is called much
|
| @@ -96,7 +99,7 @@ class ServiceWorkerDispatcher : public WorkerTaskRunner::Observer {
|
| static ServiceWorkerDispatcher* GetThreadSpecificInstance();
|
|
|
| private:
|
| - typedef IDMap<blink::WebServiceWorkerProvider::WebServiceWorkerCallbacks,
|
| + typedef IDMap<WebServiceWorkerRegistrationCallbacks,
|
| IDMapOwnPointer> CallbackMap;
|
| typedef std::map<int, blink::WebServiceWorkerProviderClient*> ScriptClientMap;
|
| typedef std::map<int, ServiceWorkerProviderContext*> ProviderContextMap;
|
|
|