content/browser/renderer_host/render_view_host_factory.cc - Issue 106963004: Make RenderFrameHostManager swap RenderFrameHosts, not RenderViewHosts.

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/renderer_host/render_view_host_factory.cc

Issue 106963004: Make RenderFrameHostManager swap RenderFrameHosts, not RenderViewHosts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix Nasko's comments Created 7 years 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

« content/browser/frame_host/render_frame_host_manager.cc ('K') | « content/browser/renderer_host/render_view_host_factory.h ('k') | content/browser/renderer_host/render_view_host_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_view_host_factory.cc

diff --git a/content/browser/renderer_host/render_view_host_factory.cc b/content/browser/renderer_host/render_view_host_factory.cc

index fe51c7efe69e2e70e569af6e945298fb88e7ea93..5cffd134b8e4e3bdef3ba93cd88c0e20ecac91b4 100644

--- a/content/browser/renderer_host/render_view_host_factory.cc

+++ b/content/browser/renderer_host/render_view_host_factory.cc

@@ -16,19 +16,17 @@ RenderViewHostFactory* RenderViewHostFactory::factory_ = NULL;

RenderViewHost* RenderViewHostFactory::Create(

SiteInstance* instance,

RenderViewHostDelegate* delegate,

- RenderFrameHostDelegate* frame_delegate,

RenderWidgetHostDelegate* widget_delegate,

int routing_id,

int main_frame_routing_id,

bool swapped_out,

bool hidden) {

if (factory_) {

- return factory_->CreateRenderViewHost(instance, delegate, frame_delegate,

- widget_delegate, routing_id,

- main_frame_routing_id, swapped_out);

+ return factory_->CreateRenderViewHost(instance, delegate, widget_delegate,

+ routing_id, main_frame_routing_id,

+ swapped_out);

}

- return new RenderViewHostImpl(instance, delegate, frame_delegate,

- widget_delegate, routing_id,

+ return new RenderViewHostImpl(instance, delegate, widget_delegate, routing_id,

main_frame_routing_id, swapped_out, hidden);

}