Chromium Code Reviews| Index: content/renderer/context_menu_params_builder.cc |
| diff --git a/content/renderer/context_menu_params_builder.cc b/content/renderer/context_menu_params_builder.cc |
| index 0b3af2b10b46d1c8b82fc6bf1c73b93822efd982..f740f79ce528c13d35d4283e7662b442424d5139 100644 |
| --- a/content/renderer/context_menu_params_builder.cc |
| +++ b/content/renderer/context_menu_params_builder.cc |
| @@ -16,7 +16,7 @@ namespace content { |
| // static |
| ContextMenuParams ContextMenuParamsBuilder::Build( |
| - const blink::WebContextMenuData& data) { |
| + const blink::WebContextMenuData& data, const PageState& state) { |
| ContextMenuParams params; |
| params.media_type = data.mediaType; |
| params.x = data.mousePosition.x; |
| @@ -49,8 +49,7 @@ ContextMenuParams ContextMenuParamsBuilder::Build( |
| for (size_t i = 0; i < data.customItems.size(); ++i) |
| params.custom_items.push_back(MenuItemBuilder::Build(data.customItems[i])); |
| - if (!data.frameHistoryItem.isNull()) |
| - params.frame_page_state = HistoryItemToPageState(data.frameHistoryItem); |
| + params.frame_page_state = state; |
|
Nate Chapin
2014/04/25 21:49:21
I'm not 100% this is safe, since this was serializ
Charlie Reis
2014/04/28 16:29:00
I'm not sure what it's used for, so it's hard to s
Nate Chapin
2014/04/28 17:31:54
Yep, right-click in iframe - > "View Page Source"
|
| if (!params.link_url.is_empty()) { |
| blink::WebNode selectedNode = data.node; |