| Index: Source/web/ServiceWorkerGlobalScopeClientImpl.h
|
| diff --git a/Source/web/ServiceWorkerGlobalScopeClientImpl.h b/Source/web/ServiceWorkerGlobalScopeClientImpl.h
|
| index b850f1a4e0ef4ad5372ff9cd4e113984f2390f50..51c8e2b9dea68341a7381185e59977c9d2cbbe78 100644
|
| --- a/Source/web/ServiceWorkerGlobalScopeClientImpl.h
|
| +++ b/Source/web/ServiceWorkerGlobalScopeClientImpl.h
|
| @@ -40,10 +40,10 @@ namespace blink {
|
| class WebServiceWorkerContextClient;
|
| class WebURL;
|
|
|
| -class ServiceWorkerGlobalScopeClientImpl FINAL : public NoBaseWillBeGarbageCollectedFinalized<ServiceWorkerGlobalScopeClientImpl>, public WebCore::ServiceWorkerGlobalScopeClient {
|
| +class ServiceWorkerGlobalScopeClientImpl FINAL : public NoBaseWillBeGarbageCollectedFinalized<ServiceWorkerGlobalScopeClientImpl>, public blink::ServiceWorkerGlobalScopeClient {
|
| WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ServiceWorkerGlobalScopeClientImpl);
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<WebCore::ServiceWorkerGlobalScopeClient> create(WebServiceWorkerContextClient&);
|
| + static PassOwnPtrWillBeRawPtr<blink::ServiceWorkerGlobalScopeClient> create(WebServiceWorkerContextClient&);
|
| virtual ~ServiceWorkerGlobalScopeClientImpl();
|
|
|
| virtual void getClients(WebServiceWorkerClientsCallbacks*);
|
| @@ -51,11 +51,11 @@ public:
|
|
|
| virtual void didHandleActivateEvent(int eventID, WebServiceWorkerEventResult) OVERRIDE;
|
| virtual void didHandleInstallEvent(int installEventID, WebServiceWorkerEventResult) OVERRIDE;
|
| - virtual void didHandleFetchEvent(int fetchEventID, PassRefPtrWillBeRawPtr<WebCore::Response>) OVERRIDE;
|
| + virtual void didHandleFetchEvent(int fetchEventID, PassRefPtrWillBeRawPtr<blink::Response>) OVERRIDE;
|
| virtual void didHandleSyncEvent(int syncEventID) OVERRIDE;
|
| virtual void postMessageToClient(int clientID, const WebString& message, PassOwnPtr<WebMessagePortChannelArray>) OVERRIDE;
|
|
|
| - virtual void trace(WebCore::Visitor* visitor) OVERRIDE { WebCore::ServiceWorkerGlobalScopeClient::trace(visitor); }
|
| + virtual void trace(blink::Visitor* visitor) OVERRIDE { blink::ServiceWorkerGlobalScopeClient::trace(visitor); }
|
|
|
| private:
|
| explicit ServiceWorkerGlobalScopeClientImpl(WebServiceWorkerContextClient&);
|
|
|