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

Side by Side Diff: content/common/worker_messages.h

Issue 9188046: Revert 116954 - Pass Content-security-policy and header type from WebSharedWorkerProxy to WebShar... (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
« no previous file with comments | « no previous file | content/renderer/websharedworker_proxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 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 // Defines messages between the browser and worker process, as well as between 5 // Defines messages between the browser and worker process, as well as between
6 // the renderer and worker process. 6 // the renderer and worker process.
7 7
8 // Multiply-included message file, hence no include guard. 8 // Multiply-included message file, hence no include guard.
9 9
10 #include <string> 10 #include <string>
11 #include <utility> 11 #include <utility>
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 128
129 // Sent by the worker process to check whether access to file system is allowed. 129 // Sent by the worker process to check whether access to file system is allowed.
130 IPC_SYNC_MESSAGE_CONTROL2_1(WorkerProcessHostMsg_AllowFileSystem, 130 IPC_SYNC_MESSAGE_CONTROL2_1(WorkerProcessHostMsg_AllowFileSystem,
131 int /* worker_route_id */, 131 int /* worker_route_id */,
132 GURL /* origin url */, 132 GURL /* origin url */,
133 bool /* result */) 133 bool /* result */)
134 134
135 //----------------------------------------------------------------------------- 135 //-----------------------------------------------------------------------------
136 // Worker messages 136 // Worker messages
137 // These are messages sent from the renderer process to the worker process. 137 // These are messages sent from the renderer process to the worker process.
138 IPC_MESSAGE_ROUTED5(WorkerMsg_StartWorkerContext, 138 IPC_MESSAGE_ROUTED3(WorkerMsg_StartWorkerContext,
139 GURL /* url */, 139 GURL /* url */,
140 string16 /* user_agent */, 140 string16 /* user_agent */,
141 string16 /* source_code */, 141 string16 /* source_code */)
142 string16 /* content_security_policy */,
143 bool /* report_only */)
144 142
145 IPC_MESSAGE_ROUTED0(WorkerMsg_TerminateWorkerContext) 143 IPC_MESSAGE_ROUTED0(WorkerMsg_TerminateWorkerContext)
146 144
147 IPC_MESSAGE_ROUTED3(WorkerMsg_PostMessage, 145 IPC_MESSAGE_ROUTED3(WorkerMsg_PostMessage,
148 string16 /* message */, 146 string16 /* message */,
149 std::vector<int> /* sent_message_port_ids */, 147 std::vector<int> /* sent_message_port_ids */,
150 std::vector<int> /* new_routing_ids */) 148 std::vector<int> /* new_routing_ids */)
151 149
152 IPC_MESSAGE_ROUTED2(WorkerMsg_Connect, 150 IPC_MESSAGE_ROUTED2(WorkerMsg_Connect,
153 int /* sent_message_port_id */, 151 int /* sent_message_port_id */,
(...skipping 16 matching lines...) Expand all
170 168
171 IPC_MESSAGE_ROUTED1(WorkerHostMsg_ConfirmMessageFromWorkerObject, 169 IPC_MESSAGE_ROUTED1(WorkerHostMsg_ConfirmMessageFromWorkerObject,
172 bool /* bool has_pending_activity */) 170 bool /* bool has_pending_activity */)
173 171
174 IPC_MESSAGE_ROUTED1(WorkerHostMsg_ReportPendingActivity, 172 IPC_MESSAGE_ROUTED1(WorkerHostMsg_ReportPendingActivity,
175 bool /* bool has_pending_activity */) 173 bool /* bool has_pending_activity */)
176 174
177 IPC_MESSAGE_CONTROL1(WorkerHostMsg_WorkerContextClosed, 175 IPC_MESSAGE_CONTROL1(WorkerHostMsg_WorkerContextClosed,
178 int /* worker_route_id */) 176 int /* worker_route_id */)
179 IPC_MESSAGE_ROUTED0(WorkerHostMsg_WorkerContextDestroyed) 177 IPC_MESSAGE_ROUTED0(WorkerHostMsg_WorkerContextDestroyed)
OLDNEW
« no previous file with comments | « no previous file | content/renderer/websharedworker_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698