| 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 header, no traditional include guard. | 5 // Multiply-included message header, no traditional include guard. |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/memory/shared_memory.h" | 10 #include "base/memory/shared_memory.h" |
| 11 #include "base/process/process.h" | 11 #include "base/process/process.h" |
| 12 #include "base/values.h" | 12 #include "base/values.h" |
| 13 #include "cc/output/compositor_frame.h" | 13 #include "cc/output/compositor_frame.h" |
| 14 #include "cc/output/compositor_frame_ack.h" | 14 #include "cc/output/compositor_frame_ack.h" |
| 15 #include "content/common/content_export.h" | 15 #include "content/common/content_export.h" |
| 16 #include "content/common/content_param_traits.h" | 16 #include "content/common/content_param_traits.h" |
| 17 #include "content/common/edit_command.h" | 17 #include "content/common/edit_command.h" |
| 18 #include "content/public/common/browser_plugin_permission_type.h" | 18 #include "content/public/common/browser_plugin_permission_type.h" |
| 19 #include "content/public/common/common_param_traits.h" | 19 #include "content/public/common/common_param_traits.h" |
| 20 #include "content/public/common/drop_data.h" | 20 #include "content/public/common/drop_data.h" |
| 21 #include "ipc/ipc_channel_handle.h" | 21 #include "ipc/ipc_channel_handle.h" |
| 22 #include "ipc/ipc_message_macros.h" | 22 #include "ipc/ipc_message_macros.h" |
| 23 #include "ipc/ipc_message_utils.h" | 23 #include "ipc/ipc_message_utils.h" |
| 24 #include "third_party/WebKit/public/web/WebDragOperation.h" | 24 #include "third_party/WebKit/public/web/WebDragOperation.h" |
| 25 #include "third_party/WebKit/public/web/WebDragStatus.h" | 25 #include "third_party/WebKit/public/web/WebDragStatus.h" |
| 26 #include "ui/gfx/point.h" | 26 #include "ui/gfx/point.h" |
| 27 #include "ui/gfx/rect.h" | 27 #include "ui/gfx/rect.h" |
| 28 #include "ui/gfx/size.h" | 28 #include "ui/gfx/size.h" |
| 29 #include "url/gurl.h" |
| 29 #include "webkit/common/cursors/webcursor.h" | 30 #include "webkit/common/cursors/webcursor.h" |
| 30 | 31 |
| 31 #undef IPC_MESSAGE_EXPORT | 32 #undef IPC_MESSAGE_EXPORT |
| 32 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 33 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| 33 | 34 |
| 34 #define IPC_MESSAGE_START BrowserPluginMsgStart | 35 #define IPC_MESSAGE_START BrowserPluginMsgStart |
| 35 | 36 |
| 36 | 37 |
| 37 IPC_ENUM_TRAITS(WebKit::WebDragStatus) | 38 IPC_ENUM_TRAITS(WebKit::WebDragStatus) |
| 38 | 39 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 62 IPC_STRUCT_MEMBER(bool, repaint) | 63 IPC_STRUCT_MEMBER(bool, repaint) |
| 63 IPC_STRUCT_END() | 64 IPC_STRUCT_END() |
| 64 | 65 |
| 65 IPC_STRUCT_BEGIN(BrowserPluginHostMsg_Attach_Params) | 66 IPC_STRUCT_BEGIN(BrowserPluginHostMsg_Attach_Params) |
| 66 IPC_STRUCT_MEMBER(std::string, storage_partition_id) | 67 IPC_STRUCT_MEMBER(std::string, storage_partition_id) |
| 67 IPC_STRUCT_MEMBER(bool, persist_storage) | 68 IPC_STRUCT_MEMBER(bool, persist_storage) |
| 68 IPC_STRUCT_MEMBER(bool, focused) | 69 IPC_STRUCT_MEMBER(bool, focused) |
| 69 IPC_STRUCT_MEMBER(bool, visible) | 70 IPC_STRUCT_MEMBER(bool, visible) |
| 70 IPC_STRUCT_MEMBER(std::string, name) | 71 IPC_STRUCT_MEMBER(std::string, name) |
| 71 IPC_STRUCT_MEMBER(std::string, src) | 72 IPC_STRUCT_MEMBER(std::string, src) |
| 73 IPC_STRUCT_MEMBER(GURL, embedder_frame_url) |
| 72 IPC_STRUCT_MEMBER(BrowserPluginHostMsg_AutoSize_Params, auto_size_params) | 74 IPC_STRUCT_MEMBER(BrowserPluginHostMsg_AutoSize_Params, auto_size_params) |
| 73 IPC_STRUCT_MEMBER(BrowserPluginHostMsg_ResizeGuest_Params, | 75 IPC_STRUCT_MEMBER(BrowserPluginHostMsg_ResizeGuest_Params, |
| 74 resize_guest_params) | 76 resize_guest_params) |
| 75 IPC_STRUCT_END() | 77 IPC_STRUCT_END() |
| 76 | 78 |
| 77 IPC_STRUCT_BEGIN(BrowserPluginMsg_Attach_ACK_Params) | 79 IPC_STRUCT_BEGIN(BrowserPluginMsg_Attach_ACK_Params) |
| 78 IPC_STRUCT_MEMBER(std::string, storage_partition_id) | 80 IPC_STRUCT_MEMBER(std::string, storage_partition_id) |
| 79 IPC_STRUCT_MEMBER(bool, persist_storage) | 81 IPC_STRUCT_MEMBER(bool, persist_storage) |
| 80 IPC_STRUCT_MEMBER(std::string, name) | 82 IPC_STRUCT_MEMBER(std::string, name) |
| 81 IPC_STRUCT_END() | 83 IPC_STRUCT_END() |
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 cc::CompositorFrame /* frame */, | 349 cc::CompositorFrame /* frame */, |
| 348 int /* route_id */, | 350 int /* route_id */, |
| 349 uint32 /* output_surface_id */, | 351 uint32 /* output_surface_id */, |
| 350 int /* renderer_host_id */) | 352 int /* renderer_host_id */) |
| 351 | 353 |
| 352 // Forwards a PointerLock Unlock request to the BrowserPlugin. | 354 // Forwards a PointerLock Unlock request to the BrowserPlugin. |
| 353 IPC_MESSAGE_CONTROL2(BrowserPluginMsg_SetMouseLock, | 355 IPC_MESSAGE_CONTROL2(BrowserPluginMsg_SetMouseLock, |
| 354 int /* instance_id */, | 356 int /* instance_id */, |
| 355 bool /* enable */) | 357 bool /* enable */) |
| 356 | 358 |
| OLD | NEW |