summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authoratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-05 08:04:18 +0000
committeratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-05 08:04:18 +0000
commitf94ead7d53296e14f1254ad1cdd4b73f3d6b9130 (patch)
tree9a69ebed813f36d6f410f5a99193c40edd6aac07 /chrome/common
parente796881505363ef53a4082bb0450cd169f1d8d44 (diff)
downloadchromium_src-f94ead7d53296e14f1254ad1cdd4b73f3d6b9130.zip
chromium_src-f94ead7d53296e14f1254ad1cdd4b73f3d6b9130.tar.gz
chromium_src-f94ead7d53296e14f1254ad1cdd4b73f3d6b9130.tar.bz2
Revert "Added beginnings of browser-process support for shared workers."
This reverts commit 31077. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/render_messages_internal.h12
-rw-r--r--chrome/common/worker_messages_internal.h4
2 files changed, 11 insertions, 5 deletions
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index c7a050c..38694f3 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -1712,9 +1712,17 @@ IPC_BEGIN_MESSAGES(ViewHost)
// A renderer sends this to the browser process when it wants to create a
// worker. The browser will create the worker process if necessary, and
// will return the route id on success. On error returns MSG_ROUTING_NONE.
- IPC_SYNC_MESSAGE_CONTROL4_1(ViewHostMsg_CreateWorker,
+ IPC_SYNC_MESSAGE_CONTROL2_1(ViewHostMsg_CreateDedicatedWorker,
+ GURL /* url */,
+ int /* render_view_route_id */,
+ int /* route_id */)
+
+ // A renderer sends this to the browser process when it wants to create a
+ // shared worker. The browser will create the worker process if necessary,
+ // and will return the route id on success. On error returns
+ // MSG_ROUTING_NONE.
+ IPC_SYNC_MESSAGE_CONTROL3_1(ViewHostMsg_CreateSharedWorker,
GURL /* url */,
- bool /* is_shared */,
string16 /* name */,
int /* render_view_route_id */,
int /* route_id */)
diff --git a/chrome/common/worker_messages_internal.h b/chrome/common/worker_messages_internal.h
index 04c983c..6ed4d09 100644
--- a/chrome/common/worker_messages_internal.h
+++ b/chrome/common/worker_messages_internal.h
@@ -13,10 +13,8 @@
// WorkerProcess messages
// These are messages sent from the browser to the worker process.
IPC_BEGIN_MESSAGES(WorkerProcess)
- IPC_MESSAGE_CONTROL4(WorkerProcessMsg_CreateWorker,
+ IPC_MESSAGE_CONTROL2(WorkerProcessMsg_CreateWorker,
GURL /* url */,
- bool /* is_shared */,
- string16 /* name */,
int /* route_id */)
// Note: these Message Port related messages can also be sent to the