content/browser/frame_host/render_frame_host_manager.cc - Issue 293093010: Rename RenderProcessHost::IsGuest to RenderProcessHost::IsIsolatedGuest

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/render_frame_host_manager.cc

Issue 293093010: Rename RenderProcessHost::IsGuest to RenderProcessHost::IsIsolatedGuest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_isguest_chrome_callsites

Patch Set: Fixed interactive_ui_tests build Created 6 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

« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.cc ('k') | content/browser/renderer_host/render_process_host_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/render_frame_host_manager.cc

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

index 29e6052fabb48307653260efd6bc6c248f984c2c..3fa8edd58a2608dcacbdec7fff20aa21f18882b4 100644

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

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

@@ -938,7 +938,8 @@ int RenderFrameHostManager::CreateRenderFrame(

// gets a RenderViewHost in the SiteInstance of its opener WebContents.

// If not used in the first navigation, this RVH is swapped out and is not

// granted bindings, so we may need to grant them when swapping it in.

- if (pending_web_ui() && !new_render_frame_host->GetProcess()->IsGuest()) {

+ if (pending_web_ui() &&

+ !new_render_frame_host->GetProcess()->IsIsolatedGuest()) {

int required_bindings = pending_web_ui()->GetBindings();

RenderViewHost* rvh = new_render_frame_host->render_view_host();

if ((rvh->GetEnabledBindings() & required_bindings) !=

@@ -1011,7 +1012,7 @@ bool RenderFrameHostManager::InitRenderView(RenderViewHost* render_view_host,

// If the pending navigation is to a WebUI and the RenderView is not in a

// guest process, tell the RenderViewHost about any bindings it will need

// enabled.

- if (pending_web_ui() && !render_view_host->GetProcess()->IsGuest()) {

+ if (pending_web_ui() && !render_view_host->GetProcess()->IsIsolatedGuest()) {

render_view_host->AllowBindings(pending_web_ui()->GetBindings());

} else {

// Ensure that we don't create an unprivileged RenderView in a WebUI-enabled

@@ -1365,7 +1366,8 @@ RenderFrameHostImpl* RenderFrameHostManager::UpdateStateForNavigate(

SetPendingWebUI(entry);

// Make sure the new RenderViewHost has the right bindings.

- if (pending_web_ui() && !render_frame_host_->GetProcess()->IsGuest()) {

+ if (pending_web_ui() &&

+ !render_frame_host_->GetProcess()->IsIsolatedGuest()) {

render_frame_host_->render_view_host()->AllowBindings(

pending_web_ui()->GetBindings());

}