| Index: trunk/src/content/browser/frame_host/render_frame_host_manager.h
|
| ===================================================================
|
| --- trunk/src/content/browser/frame_host/render_frame_host_manager.h (revision 271515)
|
| +++ trunk/src/content/browser/frame_host/render_frame_host_manager.h (working copy)
|
| @@ -57,14 +57,12 @@
|
| // corresponding to this view host. If this method is not called and the
|
| // process is not shared, then the WebContentsImpl will act as though the
|
| // renderer is not running (i.e., it will render "sad tab"). This method is
|
| - // automatically called from LoadURL. |for_main_frame| indicates whether
|
| - // this RenderViewHost is used to render a top-level frame, so the
|
| - // appropriate RenderWidgetHostView type is used.
|
| + // automatically called from LoadURL.
|
| virtual bool CreateRenderViewForRenderManager(
|
| RenderViewHost* render_view_host,
|
| int opener_route_id,
|
| int proxy_routing_id,
|
| - bool for_main_frame) = 0;
|
| + CrossProcessFrameConnector* cross_process_frame_connector) = 0;
|
| virtual void BeforeUnloadFiredFromRenderManager(
|
| bool proceed, const base::TimeTicks& proceed_time,
|
| bool* proceed_to_fire_unload) = 0;
|
| @@ -381,8 +379,7 @@
|
| // be for the RenderFrame, since frames can have openers.
|
| bool InitRenderView(RenderViewHost* render_view_host,
|
| int opener_route_id,
|
| - int proxy_routing_id,
|
| - bool for_main_frame);
|
| + int proxy_routing_id);
|
|
|
| // 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,
|
|
|