OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 // Multiply-included file, no traditional include guard. | 5 // Multiply-included file, no traditional include guard. |
6 #include <map> | 6 #include <map> |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
476 | 476 |
477 // A message for an external host. | 477 // A message for an external host. |
478 IPC_MESSAGE_ROUTED3(ChromeViewHostMsg_ForwardMessageToExternalHost, | 478 IPC_MESSAGE_ROUTED3(ChromeViewHostMsg_ForwardMessageToExternalHost, |
479 std::string /* message */, | 479 std::string /* message */, |
480 std::string /* origin */, | 480 std::string /* origin */, |
481 std::string /* target */) | 481 std::string /* target */) |
482 | 482 |
483 // A renderer sends this to the browser process when it wants to start | 483 // A renderer sends this to the browser process when it wants to start |
484 // a new instance of the Native Client process. The browser will launch | 484 // a new instance of the Native Client process. The browser will launch |
485 // the process and return a handle to an IMC channel. | 485 // the process and return a handle to an IMC channel. |
486 IPC_SYNC_MESSAGE_CONTROL2_3(ChromeViewHostMsg_LaunchNaCl, | 486 IPC_SYNC_MESSAGE_CONTROL2_4(ChromeViewHostMsg_LaunchNaCl, |
487 GURL /* manifest_url */, | 487 GURL /* manifest_url */, |
488 int /* socket count */, | 488 int /* socket count */, |
489 std::vector<nacl::FileDescriptor> | 489 std::vector<nacl::FileDescriptor> |
490 /* imc channel handles */, | 490 /* imc channel handles */, |
| 491 std::string /* ppapi_channel_name */, |
491 base::ProcessHandle /* NaCl process handle */, | 492 base::ProcessHandle /* NaCl process handle */, |
492 base::ProcessId /* NaCl process id */) | 493 base::ProcessId /* NaCl process id */) |
493 | 494 |
494 // Notification that the page has an OpenSearch description document | 495 // Notification that the page has an OpenSearch description document |
495 // associated with it. | 496 // associated with it. |
496 IPC_MESSAGE_ROUTED3(ChromeViewHostMsg_PageHasOSDD, | 497 IPC_MESSAGE_ROUTED3(ChromeViewHostMsg_PageHasOSDD, |
497 int32 /* page_id */, | 498 int32 /* page_id */, |
498 GURL /* url of OS description document */, | 499 GURL /* url of OS description document */, |
499 search_provider::OSDDType) | 500 search_provider::OSDDType) |
500 | 501 |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
623 // previous SetCookie message to be processed. | 624 // previous SetCookie message to be processed. |
624 IPC_SYNC_MESSAGE_ROUTED2_1(ChromeViewHostMsg_GetCookies, | 625 IPC_SYNC_MESSAGE_ROUTED2_1(ChromeViewHostMsg_GetCookies, |
625 GURL /* url */, | 626 GURL /* url */, |
626 GURL /* first_party_for_cookies */, | 627 GURL /* first_party_for_cookies */, |
627 std::string /* cookies */) | 628 std::string /* cookies */) |
628 | 629 |
629 // Provide the browser process with current renderer framerate. | 630 // Provide the browser process with current renderer framerate. |
630 IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_FPS, | 631 IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_FPS, |
631 int /* routing id */, | 632 int /* routing id */, |
632 float /* frames per second */) | 633 float /* frames per second */) |
OLD | NEW |