Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Unified Diff: content/renderer/context_menu_params_builder.cc

Issue 248013003: Remove WebHistoryItem child usage (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;

Powered by Google App Engine
This is Rietveld 408576698