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

Side by Side Diff: content/worker/websharedworker_stub.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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_WORKER_WEBSHAREDWORKER_STUB_H_ 5 #ifndef CONTENT_WORKER_WEBSHAREDWORKER_STUB_H_
6 #define CONTENT_WORKER_WEBSHAREDWORKER_STUB_H_ 6 #define CONTENT_WORKER_WEBSHAREDWORKER_STUB_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "content/worker/websharedworkerclient_proxy.h" 10 #include "content/worker/websharedworkerclient_proxy.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 // Returns the script url of this worker. 45 // Returns the script url of this worker.
46 const GURL& url(); 46 const GURL& url();
47 47
48 48
49 private: 49 private:
50 virtual ~WebSharedWorkerStub(); 50 virtual ~WebSharedWorkerStub();
51 51
52 void OnConnect(int sent_message_port_id, int routing_id); 52 void OnConnect(int sent_message_port_id, int routing_id);
53 void OnStartWorkerContext( 53 void OnStartWorkerContext(
54 const GURL& url, const string16& user_agent, const string16& source_code); 54 const GURL& url, const string16& user_agent, const string16& source_code,
55 const string16& content_security_policy, bool report_only);
56
55 void OnTerminateWorkerContext(); 57 void OnTerminateWorkerContext();
56 58
57 int route_id_; 59 int route_id_;
58 WorkerAppCacheInitInfo appcache_init_info_; 60 WorkerAppCacheInitInfo appcache_init_info_;
59 61
60 // WebSharedWorkerClient that responds to outgoing API calls 62 // WebSharedWorkerClient that responds to outgoing API calls
61 // from the worker object. 63 // from the worker object.
62 WebSharedWorkerClientProxy client_; 64 WebSharedWorkerClientProxy client_;
63 65
64 WebKit::WebSharedWorker* impl_; 66 WebKit::WebSharedWorker* impl_;
65 string16 name_; 67 string16 name_;
66 bool started_; 68 bool started_;
67 GURL url_; 69 GURL url_;
68 scoped_ptr<SharedWorkerDevToolsAgent> worker_devtools_agent_; 70 scoped_ptr<SharedWorkerDevToolsAgent> worker_devtools_agent_;
69 71
70 typedef std::pair<int, int> PendingConnectInfo; 72 typedef std::pair<int, int> PendingConnectInfo;
71 typedef std::vector<PendingConnectInfo> PendingConnectInfoList; 73 typedef std::vector<PendingConnectInfo> PendingConnectInfoList;
72 PendingConnectInfoList pending_connects_; 74 PendingConnectInfoList pending_connects_;
73 75
74 DISALLOW_COPY_AND_ASSIGN(WebSharedWorkerStub); 76 DISALLOW_COPY_AND_ASSIGN(WebSharedWorkerStub);
75 }; 77 };
76 78
77 #endif // CONTENT_WORKER_WEBSHAREDWORKER_STUB_H_ 79 #endif // CONTENT_WORKER_WEBSHAREDWORKER_STUB_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698