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

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

Issue 2860903006: Handle webuis when using the network service. (Closed)
Patch Set: merge Created 3 years, 7 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 d91848f64a18d546f1bc8b6376c7bfa5cf45a0b8..2d9e6e9071c62450fb2791a8c78b5dcef0a45524 100644
--- a/content/browser/loader/resource_request_info_impl.cc
+++ b/content/browser/loader/resource_request_info_impl.cc
@@ -20,16 +20,6 @@ namespace content {
namespace {
-WebContents* GetWebContentsFromFTNID(int frame_tree_node_id) {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
- FrameTreeNode* frame_tree_node =
- FrameTreeNode::GloballyFindByID(frame_tree_node_id);
- if (!frame_tree_node)
- return nullptr;
-
- return WebContentsImpl::FromFrameTreeNode(frame_tree_node);
-}
-
int FrameTreeNodeIdFromHostIds(int render_process_host_id,
int render_frame_host_id) {
RenderFrameHost* render_frame_host =
@@ -203,7 +193,7 @@ ResourceRequestInfoImpl::GetWebContentsGetterForRequest() const {
// ID should be used to access the WebContents.
if (frame_tree_node_id_ != -1) {
DCHECK(IsBrowserSideNavigationEnabled());
- return base::Bind(&GetWebContentsFromFTNID, frame_tree_node_id_);
+ return base::Bind(WebContents::FromFrameTreeNodeId, frame_tree_node_id_);
}
// In other cases, use the RenderProcessHost ID + RenderFrameHost ID to get
« no previous file with comments | « content/browser/loader/navigation_url_loader_network_service.cc ('k') | content/browser/storage_partition_impl_map.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698