| 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 8d5b594d780e49a33fb561e49b3a2719514855a1..82c38a8ace1b1f300c23303fc31be5a98bcafe5f 100644
|
| --- a/content/browser/frame_host/render_frame_host_manager.h
|
| +++ b/content/browser/frame_host/render_frame_host_manager.h
|
| @@ -64,7 +64,7 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
|
| virtual bool CreateRenderViewForRenderManager(
|
| RenderViewHost* render_view_host,
|
| int opener_route_id,
|
| - CrossProcessFrameConnector* cross_process_frame_connector) = 0;
|
| + bool for_subframe) = 0;
|
| virtual void BeforeUnloadFiredFromRenderManager(
|
| bool proceed, const base::TimeTicks& proceed_time,
|
| bool* proceed_to_fire_unload) = 0;
|
| @@ -380,7 +380,9 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
|
| // initialized for another RenderFrameHost.
|
| // TODO(creis): opener_route_id is currently for the RenderViewHost but should
|
| // be for the RenderFrame, since frames can have openers.
|
| - bool InitRenderView(RenderViewHost* render_view_host, int opener_route_id);
|
| + bool InitRenderView(RenderViewHost* render_view_host,
|
| + int opener_route_id,
|
| + bool for_subframe);
|
|
|
| // Sets the pending RenderFrameHost/WebUI to be the active one. Note that this
|
| // doesn't require the pending render_frame_host_ pointer to be non-NULL,
|
|
|