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

Unified Diff: content/browser/worker_host/worker_process_host.h

Issue 115713004: Move the worker script loading code to the worker process (phase:2/5) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move IPC_ENUM_TRAITS(blink::WebContentSecurityPolicyType) to content_param_traits_macros.h. Created 6 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/browser/DEPS ('k') | content/browser/worker_host/worker_process_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/worker_host/worker_process_host.h
diff --git a/content/browser/worker_host/worker_process_host.h b/content/browser/worker_host/worker_process_host.h
index e0c0ef211d3daa7323dc059152fcd60f14be1b5f..0d286e0fac3bdceb4cfe09021799216cdda4d9f2 100644
--- a/content/browser/worker_host/worker_process_host.h
+++ b/content/browser/worker_host/worker_process_host.h
@@ -19,6 +19,7 @@
#include "content/public/browser/browser_child_process_host_iterator.h"
#include "content/public/common/process_type.h"
#include "ipc/ipc_sender.h"
+#include "third_party/WebKit/public/web/WebContentSecurityPolicy.h"
#include "url/gurl.h"
#include "webkit/common/resource_type.h"
@@ -58,6 +59,8 @@ class WorkerProcessHost : public BrowserChildProcessHostDelegate,
public:
WorkerInstance(const GURL& url,
const base::string16& name,
+ const base::string16& content_security_policy,
+ blink::WebContentSecurityPolicyType security_policy_type,
int worker_route_id,
int parent_process_id,
int64 main_resource_appcache_id,
@@ -108,6 +111,12 @@ class WorkerProcessHost : public BrowserChildProcessHostDelegate,
void set_closed(bool closed) { closed_ = closed; }
const GURL& url() const { return url_; }
const base::string16 name() const { return name_; }
+ const base::string16 content_security_policy() const {
+ return content_security_policy_;
+ }
+ blink::WebContentSecurityPolicyType security_policy_type() const {
+ return security_policy_type_;
+ }
int worker_route_id() const { return worker_route_id_; }
int parent_process_id() const { return parent_process_id_; }
int64 main_resource_appcache_id() const {
@@ -128,6 +137,8 @@ class WorkerProcessHost : public BrowserChildProcessHostDelegate,
GURL url_;
bool closed_;
base::string16 name_;
+ base::string16 content_security_policy_;
+ blink::WebContentSecurityPolicyType security_policy_type_;
int worker_route_id_;
int parent_process_id_;
int64 main_resource_appcache_id_;
« no previous file with comments | « content/browser/DEPS ('k') | content/browser/worker_host/worker_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698