| 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 message file, so no include guard. | 5 // Multiply-included message file, so no include guard. |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 11 #include "content/common/content_export.h" | 11 #include "content/common/content_export.h" |
| 12 #include "content/public/common/common_param_traits.h" | 12 #include "content/public/common/common_param_traits.h" |
| 13 #include "content/public/common/webplugininfo.h" | 13 #include "content/public/common/webplugininfo.h" |
| 14 #include "ipc/ipc_message_macros.h" | 14 #include "ipc/ipc_message_macros.h" |
| 15 | 15 |
| 16 #undef IPC_MESSAGE_EXPORT | 16 #undef IPC_MESSAGE_EXPORT |
| 17 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 17 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| 18 #define IPC_MESSAGE_START UtilityMsgStart | 18 #define IPC_MESSAGE_START UtilityMsgStart |
| 19 | 19 |
| 20 //------------------------------------------------------------------------------ | 20 //------------------------------------------------------------------------------ |
| 21 // Utility process messages: | 21 // Utility process messages: |
| 22 // These are messages from the browser to the utility process. | 22 // These are messages from the browser to the utility process. |
| 23 | 23 |
| 24 // Tells the utility process that it's running in batch mode. | 24 // Tells the utility process that it's running in batch mode. |
| 25 IPC_MESSAGE_CONTROL0(UtilityMsg_BatchMode_Started) | 25 IPC_MESSAGE_CONTROL0(UtilityMsg_BatchMode_Started) |
| 26 | 26 |
| 27 // Tells the utility process that it can shutdown. | 27 // Tells the utility process that it can shutdown. |
| 28 IPC_MESSAGE_CONTROL0(UtilityMsg_BatchMode_Finished) | 28 IPC_MESSAGE_CONTROL0(UtilityMsg_BatchMode_Finished) |
| 29 | 29 |
| 30 // Tells the utility process that it can shutdown. |
| 31 // TODO(haven): Debugging only. Remove before submission. |
| 32 IPC_MESSAGE_CONTROL0(UtilityMsg_EffectiveUser) |
| 33 |
| 30 #if defined(OS_POSIX) | 34 #if defined(OS_POSIX) |
| 31 // Tells the utility process to load each plugin in the order specified by the | 35 // Tells the utility process to load each plugin in the order specified by the |
| 32 // vector. It will respond after each load with the WebPluginInfo. | 36 // vector. It will respond after each load with the WebPluginInfo. |
| 33 IPC_MESSAGE_CONTROL1(UtilityMsg_LoadPlugins, | 37 IPC_MESSAGE_CONTROL1(UtilityMsg_LoadPlugins, |
| 34 std::vector<base::FilePath> /* plugin paths */) | 38 std::vector<base::FilePath> /* plugin paths */) |
| 35 #endif | 39 #endif |
| 36 | 40 |
| 37 //------------------------------------------------------------------------------ | 41 //------------------------------------------------------------------------------ |
| 38 // Utility process host messages: | 42 // Utility process host messages: |
| 39 // These are messages from the utility process to the browser. | 43 // These are messages from the utility process to the browser. |
| 40 | 44 |
| 41 #if defined(OS_POSIX) | 45 #if defined(OS_POSIX) |
| 42 // Notifies the browser when a plugin failed to load so the two processes can | 46 // Notifies the browser when a plugin failed to load so the two processes can |
| 43 // keep the canonical list in sync. | 47 // keep the canonical list in sync. |
| 44 IPC_SYNC_MESSAGE_CONTROL2_0(UtilityHostMsg_LoadPluginFailed, | 48 IPC_SYNC_MESSAGE_CONTROL2_0(UtilityHostMsg_LoadPluginFailed, |
| 45 uint32_t /* index in the vector */, | 49 uint32_t /* index in the vector */, |
| 46 base::FilePath /* path of plugin */) | 50 base::FilePath /* path of plugin */) |
| 47 | 51 |
| 48 // Notifies the browser that a plugin in the vector sent by it has been loaded. | 52 // Notifies the browser that a plugin in the vector sent by it has been loaded. |
| 49 IPC_SYNC_MESSAGE_CONTROL2_0(UtilityHostMsg_LoadedPlugin, | 53 IPC_SYNC_MESSAGE_CONTROL2_0(UtilityHostMsg_LoadedPlugin, |
| 50 uint32_t /* index in the vector */, | 54 uint32_t /* index in the vector */, |
| 51 content::WebPluginInfo /* plugin info */) | 55 content::WebPluginInfo /* plugin info */) |
| 52 #endif // OS_POSIX | 56 #endif // OS_POSIX |
| 57 // |
| 58 // Tells the utility process that it can shutdown. |
| 59 // TODO(haven): Debugging only. Remove before submission. |
| 60 IPC_MESSAGE_CONTROL1(UtilityHostMsg_EffectiveUser, |
| 61 int /* user id. */) |
| OLD | NEW |