Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2501)

Unified Diff: content/renderer/websharedworker_proxy.h

Issue 9154003: Pass Content-security-policy and header type from WebSharedWorkerProxy to WebSharedWorkerStub. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/worker_messages.h ('k') | content/renderer/websharedworker_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/websharedworker_proxy.h
===================================================================
--- content/renderer/websharedworker_proxy.h (revision 118326)
+++ content/renderer/websharedworker_proxy.h (working copy)
@@ -37,11 +37,25 @@
virtual bool isStarted();
virtual void connect(WebKit::WebMessagePortChannel* channel,
ConnectListener* listener);
+
+ // API is evolving from first form to second. This function must remain
+ // virtual to avoid conflicts on the webkit roll.
+ // DEPRECATED
virtual void startWorkerContext(const WebKit::WebURL& script_url,
const WebKit::WebString& name,
const WebKit::WebString& user_agent,
const WebKit::WebString& source_code,
long long script_resource_appcache_id);
+
+ 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,
+ long long script_resource_appcache_id);
+
virtual void terminateWorkerContext();
virtual void clientDestroyed();
@@ -70,6 +84,8 @@
const string16& name,
const string16& user_agent,
const string16& source_code,
+ const string16& content_security_policy,
+ WebKit::WebContentSecurityPolicyType policy_type,
int pending_route_id,
int64 script_resource_appcache_id);
void OnWorkerCreated();
« no previous file with comments | « content/common/worker_messages.h ('k') | content/renderer/websharedworker_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698