Chromium Code Reviews| Index: content/common/frame_messages.h |
| diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h |
| index e06b2e8d8ee08396b8f51e866c4d83f268f35a6b..837e4c55d39b3b30034fc50c081d2b54b7880572 100644 |
| --- a/content/common/frame_messages.h |
| +++ b/content/common/frame_messages.h |
| @@ -15,6 +15,7 @@ |
| #include "content/common/navigation_gesture.h" |
| #include "content/common/navigation_params.h" |
| #include "content/common/resource_request_body.h" |
| +#include "content/common/savable_subframe.h" |
| #include "content/public/common/color_suggestion.h" |
| #include "content/public/common/common_param_traits.h" |
| #include "content/public/common/console_message_level.h" |
| @@ -398,6 +399,11 @@ IPC_STRUCT_BEGIN(FrameMsg_TextTrackSettings_Params) |
| IPC_STRUCT_MEMBER(std::string, text_track_text_size) |
| IPC_STRUCT_END() |
| +IPC_STRUCT_TRAITS_BEGIN(content::SavableSubframe) |
|
ncarter (slow)
2015/10/28 22:28:38
Just mentioning this as an option in case you hadn
ncarter (slow)
2015/10/28 22:29:34
Duh, you totally explained this in your commit com
|
| + IPC_STRUCT_TRAITS_MEMBER(original_url) |
| + IPC_STRUCT_TRAITS_MEMBER(routing_id) |
| +IPC_STRUCT_TRAITS_END() |
| + |
| #if defined(OS_MACOSX) || defined(OS_ANDROID) |
| // This message is used for supporting popup menus on Mac OS X and Android using |
| // native controls. See the FrameHostMsg_ShowPopup message. |
| @@ -1174,11 +1180,10 @@ IPC_MESSAGE_ROUTED2(FrameHostMsg_DidRunInsecureContent, |
| GURL /* target URL */) |
| // Response to FrameMsg_GetSavableResourceLinks. |
| -IPC_MESSAGE_ROUTED4(FrameHostMsg_SavableResourceLinksResponse, |
| +IPC_MESSAGE_ROUTED3(FrameHostMsg_SavableResourceLinksResponse, |
| std::vector<GURL> /* savable resource links */, |
| std::vector<content::Referrer> /* referrers */, |
| - std::vector<GURL> /* subframe original links */, |
| - std::vector<int> /* subframe routing ids */) |
| + std::vector<content::SavableSubframe> /* subframes */); |
| // Response to FrameMsg_GetSavableResourceLinks in case the frame contains |
| // non-savable content (i.e. from a non-savable scheme) or if there were |