| Index: public/web/WebFrameClient.h
|
| diff --git a/public/web/WebFrameClient.h b/public/web/WebFrameClient.h
|
| index 640467e415270e9a37293991000433783f717ac6..a6f24f11c7e740a5d8e630ede5de1eadfabd38ea 100644
|
| --- a/public/web/WebFrameClient.h
|
| +++ b/public/web/WebFrameClient.h
|
| @@ -104,10 +104,8 @@ public:
|
| // May return null.
|
| virtual WebApplicationCacheHost* createApplicationCacheHost(WebLocalFrame*, WebApplicationCacheHostClient*) { return 0; }
|
|
|
| - // May return null. Takes ownership of the client.
|
| - // FIXME: Deprecate the second argument.
|
| - virtual WebServiceWorkerProvider* createServiceWorkerProvider(WebLocalFrame*, WebServiceWorkerProviderClient*) { return 0; }
|
| - virtual WebServiceWorkerProvider* createServiceWorkerProvider(WebLocalFrame* frame) { return createServiceWorkerProvider(frame, 0); }
|
| + // May return null.
|
| + virtual WebServiceWorkerProvider* createServiceWorkerProvider(WebLocalFrame* frame) { return 0; }
|
|
|
| // May return null.
|
| virtual WebWorkerPermissionClientProxy* createWorkerPermissionClientProxy(WebLocalFrame*) { return 0; }
|
| @@ -172,8 +170,6 @@ public:
|
|
|
| // The client should handle the navigation externally.
|
| virtual void loadURLExternally(
|
| - WebLocalFrame*, const WebURLRequest&, WebNavigationPolicy) { }
|
| - virtual void loadURLExternally(
|
| WebLocalFrame*, const WebURLRequest&, WebNavigationPolicy, const WebString& downloadName) { }
|
|
|
|
|
| @@ -347,10 +343,7 @@ public:
|
| WebLocalFrame*, unsigned identifier, const WebURLResponse&) { }
|
|
|
| virtual void didChangeResourcePriority(
|
| - WebLocalFrame*, unsigned identifier, const blink::WebURLRequest::Priority&) { }
|
| -
|
| - virtual void didChangeResourcePriority(
|
| - WebLocalFrame* webFrame, unsigned identifier, const blink::WebURLRequest::Priority& priority, int) { didChangeResourcePriority(webFrame, identifier, priority); }
|
| + WebLocalFrame* webFrame, unsigned identifier, const blink::WebURLRequest::Priority& priority, int) { }
|
|
|
| // The resource request given by identifier succeeded.
|
| virtual void didFinishResourceLoad(
|
|
|