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

Unified Diff: content/browser/frame_host/render_frame_host_impl.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
Index: content/browser/frame_host/render_frame_host_impl.h
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index fbc2c00c4c8bdb7d5a917ee30d228bf6c9110908..5e4ae6986dbcf60ec6c0333c8bd98fd4c30b6d43 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -148,7 +148,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
// Creates a RenderFrame in the renderer process. Only called for
// cross-process subframe navigations in --site-per-process.
- bool CreateRenderFrame(int parent_routing_id);
+ bool CreateRenderFrame(int parent_routing_id, int proxy_routing_id);
// Returns whether the RenderFrame in the renderer process has been created
// and still has a connection. This is valid for all frames.

Powered by Google App Engine
This is Rietveld 408576698