Index: content/browser/web_contents/web_contents_impl.cc |
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
index 0ce71203158c353765b3b0d026b9937f7fdbec6c..9c40100612d6022542c28706a618ade5f8abd5e0 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -3859,8 +3859,8 @@ |
int WebContentsImpl::CreateSwappedOutRenderView( |
SiteInstance* instance) { |
- return GetRenderManager()->CreateRenderFrame( |
- instance, MSG_ROUTING_NONE, true, true, true); |
+ return GetRenderManager()->CreateRenderFrame(instance, MSG_ROUTING_NONE, |
+ true, true); |
} |
void WebContentsImpl::OnUserGesture() { |
@@ -4030,8 +4030,8 @@ |
// Create a swapped out RenderView in the given SiteInstance if none exists, |
// setting its opener to the given route_id. Return the new view's route_id. |
- return GetRenderManager()->CreateRenderFrame( |
- instance, opener_route_id, true, true, true); |
+ return GetRenderManager()->CreateRenderFrame(instance, opener_route_id, |
+ true, true); |
} |
NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() { |
@@ -4051,7 +4051,7 @@ |
RenderViewHost* render_view_host, |
int opener_route_id, |
int proxy_routing_id, |
- bool for_main_frame_navigation) { |
+ bool for_main_frame) { |
TRACE_EVENT0("browser", "WebContentsImpl::CreateRenderViewForRenderManager"); |
// Can be NULL during tests. |
RenderWidgetHostViewBase* rwh_view; |
@@ -4059,7 +4059,7 @@ |
// until RenderWidgetHost is attached to RenderFrameHost. We need to special |
// case this because RWH is still a base class of RenderViewHost, and child |
// frame RWHVs are unique in that they do not have their own WebContents. |
- if (!for_main_frame_navigation) { |
+ if (!for_main_frame) { |
RenderWidgetHostViewChildFrame* rwh_view_child = |
new RenderWidgetHostViewChildFrame(render_view_host); |
rwh_view = rwh_view_child; |
@@ -4093,23 +4093,6 @@ |
render_widget_host->WasResized(); |
} |
#endif |
- |
- return true; |
-} |
- |
-bool WebContentsImpl::CreateRenderFrameForRenderManager( |
- RenderFrameHost* render_frame_host, |
- int parent_routing_id) { |
- TRACE_EVENT0("browser", "WebContentsImpl::CreateRenderFrameForRenderManager"); |
- |
- RenderFrameHostImpl* rfh = |
- static_cast<RenderFrameHostImpl*>(render_frame_host); |
- if (!rfh->CreateRenderFrame(parent_routing_id)) |
- return false; |
- |
- // TODO(nasko): When RenderWidgetHost is owned by RenderFrameHost, the passed |
- // RenderFrameHost will have to be associated with the appropriate |
- // RenderWidgetHostView or a new one should be created here. |
return true; |
} |