content/browser/frame_host/render_frame_host_manager.h - Issue 600553003: Enable swapping a frame back in to its parent process

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.h

Issue 600553003: Enable swapping a frame back in to its parent process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remoteToLocal

Patch Set: Created 6 years, 2 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/frame_host/render_frame_host_manager.cc » ('j') | content/browser/frame_host/render_frame_host_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/render_frame_host_manager.h

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

index ff9d7699b4a2d00a6787b49cb085bf8addb7bd2e..4ba54355552568b5f3e1ffa0b1c907a9d7911faa 100644

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

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

@@ -123,7 +123,8 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {

bool for_main_frame_navigation) = 0;

virtual bool CreateRenderFrameForRenderManager(

RenderFrameHost* render_frame_host,

- int parent_routing_id) = 0;

+ int parent_routing_id,

+ int proxy_routing_id) = 0;

virtual void BeforeUnloadFiredFromRenderManager(

bool proceed, const base::TimeTicks& proceed_time,

bool* proceed_to_fire_unload) = 0;