| Index: content/renderer/websharedworker_proxy.h
|
| diff --git a/content/renderer/websharedworker_proxy.h b/content/renderer/websharedworker_proxy.h
|
| index 75c7b5505edc842ed548d340944a812a07d6edcc..92f1a2053b3248ac5406d9ec882857b5017e9110 100644
|
| --- a/content/renderer/websharedworker_proxy.h
|
| +++ b/content/renderer/websharedworker_proxy.h
|
| @@ -23,7 +23,7 @@ class ChildThread;
|
| // thread. Once the connect event has been sent, all future communication will
|
| // happen via the WebMessagePortChannel, and the WebSharedWorker instance will
|
| // be freed.
|
| -class WebSharedWorkerProxy : public WebKit::WebSharedWorker,
|
| +class WebSharedWorkerProxy : public blink::WebSharedWorker,
|
| private IPC::Listener {
|
| public:
|
| // If the worker not loaded yet, route_id == MSG_ROUTING_NONE
|
| @@ -36,16 +36,16 @@ class WebSharedWorkerProxy : public WebKit::WebSharedWorker,
|
|
|
| // Implementations of WebSharedWorker APIs
|
| virtual bool isStarted();
|
| - virtual void connect(WebKit::WebMessagePortChannel* channel,
|
| + virtual void connect(blink::WebMessagePortChannel* channel,
|
| ConnectListener* listener);
|
|
|
| virtual void startWorkerContext(
|
| - const WebKit::WebURL& script_url,
|
| - const WebKit::WebString& name,
|
| - const WebKit::WebString& user_agent,
|
| - const WebKit::WebString& source_code,
|
| - const WebKit::WebString& content_security_policy,
|
| - WebKit::WebContentSecurityPolicyType policy_type,
|
| + const blink::WebURL& script_url,
|
| + const blink::WebString& name,
|
| + const blink::WebString& user_agent,
|
| + const blink::WebString& source_code,
|
| + const blink::WebString& content_security_policy,
|
| + blink::WebContentSecurityPolicyType policy_type,
|
| long long script_resource_appcache_id);
|
|
|
| virtual void terminateWorkerContext();
|
| @@ -77,7 +77,7 @@ class WebSharedWorkerProxy : public WebKit::WebSharedWorker,
|
| const string16& user_agent,
|
| const string16& source_code,
|
| const string16& content_security_policy,
|
| - WebKit::WebContentSecurityPolicyType policy_type,
|
| + blink::WebContentSecurityPolicyType policy_type,
|
| int pending_route_id,
|
| int64 script_resource_appcache_id);
|
| void OnWorkerCreated();
|
|
|