| Index: content/browser/frame_host/render_frame_host_manager.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
|
| index d39d388bdc062eb58d16ece657f1bab510623c2e..8d2db5454677d84d5d2d7e30ac4e24288680a162 100644
|
| --- a/content/browser/frame_host/render_frame_host_manager.cc
|
| +++ b/content/browser/frame_host/render_frame_host_manager.cc
|
| @@ -546,6 +546,10 @@ void RenderFrameHostManager::ClearPendingShutdownRFHForSiteInstance(
|
| pending_delete_hosts_.erase(site_instance_id);
|
| }
|
|
|
| +void RenderFrameHostManager::ResetProxyHosts() {
|
| + STLDeleteValues(&proxy_hosts_);
|
| +}
|
| +
|
| void RenderFrameHostManager::Observe(
|
| int type,
|
| const NotificationSource& source,
|
| @@ -898,6 +902,7 @@ int RenderFrameHostManager::CreateRenderFrame(
|
| DCHECK(!swapped_out || hidden); // Swapped out views should always be hidden.
|
|
|
| scoped_ptr<RenderFrameHostImpl> new_render_frame_host;
|
| + RenderFrameHostImpl* frame_to_announce = NULL;
|
| int routing_id = MSG_ROUTING_NONE;
|
|
|
| // We are creating a pending or swapped out RFH here. We should never create
|
| @@ -951,6 +956,7 @@ int RenderFrameHostManager::CreateRenderFrame(
|
| RenderViewHostImpl* render_view_host =
|
| new_render_frame_host->render_view_host();
|
| int proxy_routing_id = MSG_ROUTING_NONE;
|
| + frame_to_announce = new_render_frame_host.get();
|
|
|
| // Prevent the process from exiting while we're trying to navigate in it.
|
| // Otherwise, if the new RFH is swapped out already, store it.
|
| @@ -979,6 +985,10 @@ int RenderFrameHostManager::CreateRenderFrame(
|
| if (!swapped_out)
|
| pending_render_frame_host_ = new_render_frame_host.Pass();
|
|
|
| + // If a brand new RFH was created, announce it to observers.
|
| + if (frame_to_announce)
|
| + render_frame_delegate_->RenderFrameCreated(frame_to_announce);
|
| +
|
| return routing_id;
|
| }
|
|
|
|
|