| 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 82a9f8b14d9213b0a56d2cc6677d46baef7985b4..a6db72b3d65b9ae8632b6ec864de694acc28a529 100644
|
| --- a/content/child/service_worker/service_worker_dispatcher.h
|
| +++ b/content/child/service_worker/service_worker_dispatcher.h
|
| @@ -13,7 +13,7 @@
|
|
|
| class GURL;
|
|
|
| -namespace WebKit {
|
| +namespace blink {
|
| class WebURL;
|
| }
|
|
|
| @@ -41,11 +41,11 @@ class ServiceWorkerDispatcher : public webkit_glue::WorkerTaskRunner::Observer {
|
| void RegisterServiceWorker(
|
| const GURL& pattern,
|
| const GURL& script_url,
|
| - WebKit::WebServiceWorkerProvider::WebServiceWorkerCallbacks* callbacks);
|
| + blink::WebServiceWorkerProvider::WebServiceWorkerCallbacks* callbacks);
|
| // Corresponds to navigator.unregisterServiceWorker()
|
| void UnregisterServiceWorker(
|
| const GURL& pattern,
|
| - WebKit::WebServiceWorkerProvider::WebServiceWorkerCallbacks* callbacks);
|
| + blink::WebServiceWorkerProvider::WebServiceWorkerCallbacks* callbacks);
|
|
|
| // |thread_safe_sender| needs to be passed in because if the call leads to
|
| // construction it will be needed.
|
| @@ -63,7 +63,7 @@ class ServiceWorkerDispatcher : public webkit_glue::WorkerTaskRunner::Observer {
|
| // The asynchronous success response to UregisterServiceWorker.
|
| void OnServiceWorkerUnregistered(int32 thread_id, int32 request_id);
|
|
|
| - IDMap<WebKit::WebServiceWorkerProvider::WebServiceWorkerCallbacks,
|
| + IDMap<blink::WebServiceWorkerProvider::WebServiceWorkerCallbacks,
|
| IDMapOwnPointer> pending_callbacks_;
|
|
|
| scoped_refptr<ThreadSafeSender> thread_safe_sender_;
|
|
|