content/browser/frame_host/navigator_impl.cc - Issue 1472703004: Reland #2 of: Move WebUI ownership from the RenderFrameHostManager to the RenderFrameHost.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/frame_host/navigator_impl.cc

Issue 1472703004: Reland #2 of: Move WebUI ownership from the RenderFrameHostManager to the RenderFrameHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Tests simulatneous navigation involving WebUIs; minor test improvements. Created 5 years, 1 month 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

« no previous file with comments | « content/browser/frame_host/frame_tree.cc ('k') | content/browser/frame_host/render_frame_host_delegate.h » ('j') | content/browser/frame_host/render_frame_host_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/navigator_impl.cc

diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc

index ce8891c9dc0e4e01226259682576218f197ae006..742445a9c76934bb736a3b4af2217c684b212d6c 100644

--- a/content/browser/frame_host/navigator_impl.cc

+++ b/content/browser/frame_host/navigator_impl.cc

@@ -578,9 +578,10 @@ void NavigatorImpl::RequestTransferURL(

bool should_replace_current_entry,

bool user_gesture) {

GURL dest_url(url);

+ RenderFrameHostImpl* current_render_frame_host =

+ GetRenderManager(render_frame_host)->current_frame_host();

SiteInstance* current_site_instance =

- GetRenderManager(render_frame_host)->current_frame_host()->

- GetSiteInstance();

+ current_render_frame_host->GetSiteInstance();

if (!GetContentClient()->browser()->ShouldAllowOpenURL(

current_site_instance, url)) {

dest_url = GURL(url::kAboutBlankURL);

@@ -607,7 +608,7 @@ void NavigatorImpl::RequestTransferURL(

params.should_replace_current_entry = should_replace_current_entry;

params.user_gesture = user_gesture;

- if (GetRenderManager(render_frame_host)->web_ui()) {

+ if (current_render_frame_host->web_ui()) {

// Web UI pages sometimes want to override the page transition type for

// link clicks (e.g., so the new tab page can specify AUTO_BOOKMARK for

// automatically generated suggestions). We don't override other types

@@ -615,8 +616,7 @@ void NavigatorImpl::RequestTransferURL(

if (ui::PageTransitionCoreTypeIs(

params.transition, ui::PAGE_TRANSITION_LINK))

params.transition =

- GetRenderManager(render_frame_host)->web_ui()->

- GetLinkTransitionType();

+ current_render_frame_host->web_ui()->GetLinkTransitionType();

// Note also that we hide the referrer for Web UI pages. We don't really

// want web sites to see a referrer of "chrome://blah" (and some