diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-23 23:50:10 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-23 23:50:10 +0000 |
| commit | 4d3eb1da483f0c50282e4f78fd0344a0dc3ffd42 (patch) | |
| tree | e07a8daf01551fbe199adeae938fe55ba23e75f3 /chrome/common/worker_messages_internal.h | |
| parent | ce7466172c196bf06ccd473677b218eead15b089 (diff) | |
| download | chromium_src-4d3eb1da483f0c50282e4f78fd0344a0dc3ffd42.zip chromium_src-4d3eb1da483f0c50282e4f78fd0344a0dc3ffd42.tar.gz chromium_src-4d3eb1da483f0c50282e4f78fd0344a0dc3ffd42.tar.bz2 | |
Chrome side of webkit merge from r41860 to 41906.
The encoding parameter got dropped from Workers (r41871) so
drop it through the whole stack.
The upstream WorkerContextExecutionProxy has trackEvent with a lower
case t, but we pull in the wrong header in some places so make
both headers match.
Review URL: http://codereview.chromium.org/42538
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12326 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/worker_messages_internal.h')
| -rw-r--r-- | chrome/common/worker_messages_internal.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/common/worker_messages_internal.h b/chrome/common/worker_messages_internal.h index 5d8449e..7691c79 100644 --- a/chrome/common/worker_messages_internal.h +++ b/chrome/common/worker_messages_internal.h @@ -29,10 +29,9 @@ IPC_END_MESSAGES(WorkerProcess) // Worker messages // These are messages sent from the renderer process to the worker process. IPC_BEGIN_MESSAGES(Worker) - IPC_MESSAGE_ROUTED4(WorkerMsg_StartWorkerContext, + IPC_MESSAGE_ROUTED3(WorkerMsg_StartWorkerContext, GURL /* url */, string16 /* user_agent */, - string16 /* encoding */, string16 /* source_code */) IPC_MESSAGE_ROUTED0(WorkerMsg_TerminateWorkerContext) |