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

Unified Diff: content/browser/loader/resource_request_info_impl.cc

Issue 1413543005: Use FrameTreeNode ID as frameId in extension APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: s/:/ / Created 4 years, 11 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/browser/loader/resource_request_info_impl.cc
diff --git a/content/browser/loader/resource_request_info_impl.cc b/content/browser/loader/resource_request_info_impl.cc
index a269baf9b732e3e3ea1b5c132669e213be310eac..0f61829f2dfd88eea2c85a45a097950ac4eec880 100644
--- a/content/browser/loader/resource_request_info_impl.cc
+++ b/content/browser/loader/resource_request_info_impl.cc
@@ -71,7 +71,6 @@ void ResourceRequestInfo::AllocateForTesting(net::URLRequest* request,
render_frame_id, // render_frame_id
is_main_frame, // is_main_frame
parent_is_main_frame, // parent_is_main_frame
- 0, // parent_render_frame_id
resource_type, // resource_type
ui::PAGE_TRANSITION_LINK, // transition_type
false, // should_replace_current_entry
@@ -132,7 +131,6 @@ ResourceRequestInfoImpl::ResourceRequestInfoImpl(
int render_frame_id,
bool is_main_frame,
bool parent_is_main_frame,
- int parent_render_frame_id,
ResourceType resource_type,
ui::PageTransition transition_type,
bool should_replace_current_entry,
@@ -162,7 +160,6 @@ ResourceRequestInfoImpl::ResourceRequestInfoImpl(
render_frame_id_(render_frame_id),
is_main_frame_(is_main_frame),
parent_is_main_frame_(parent_is_main_frame),
- parent_render_frame_id_(parent_render_frame_id),
should_replace_current_entry_(should_replace_current_entry),
is_download_(is_download),
is_stream_(is_stream),
@@ -240,10 +237,6 @@ bool ResourceRequestInfoImpl::ParentIsMainFrame() const {
return parent_is_main_frame_;
}
-int ResourceRequestInfoImpl::GetParentRenderFrameID() const {
- return parent_render_frame_id_;
-}
-
ResourceType ResourceRequestInfoImpl::GetResourceType() const {
return resource_type_;
}
@@ -330,13 +323,11 @@ void ResourceRequestInfoImpl::UpdateForTransfer(
int route_id,
int origin_pid,
int request_id,
- int parent_render_frame_id,
base::WeakPtr<ResourceMessageFilter> filter) {
child_id_ = child_id;
route_id_ = route_id;
origin_pid_ = origin_pid;
request_id_ = request_id;
- parent_render_frame_id_ = parent_render_frame_id;
filter_ = filter;
}

Powered by Google App Engine
This is Rietveld 408576698