| Index: content/browser/frame_host/render_frame_host_impl.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
|
| index 06993931cba1750bd8883cce700e93d8bac6dcc9..69f74e2654d75cfaeab2e8db0ae8b56169254f41 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.cc
|
| +++ b/content/browser/frame_host/render_frame_host_impl.cc
|
| @@ -279,6 +279,8 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) {
|
| IPC_MESSAGE_HANDLER(FrameHostMsg_DidStartLoading, OnDidStartLoading)
|
| IPC_MESSAGE_HANDLER(FrameHostMsg_DidStopLoading, OnDidStopLoading)
|
| IPC_MESSAGE_HANDLER(FrameHostMsg_OpenURL, OnOpenURL)
|
| + IPC_MESSAGE_HANDLER(FrameHostMsg_DocumentOnLoadCompleted,
|
| + OnDocumentOnLoadCompleted)
|
| IPC_MESSAGE_HANDLER(FrameHostMsg_BeforeUnload_ACK, OnBeforeUnloadACK)
|
| IPC_MESSAGE_HANDLER(FrameHostMsg_SwapOut_ACK, OnSwapOutACK)
|
| IPC_MESSAGE_HANDLER(FrameHostMsg_ContextMenu, OnContextMenu)
|
| @@ -357,6 +359,13 @@ void RenderFrameHostImpl::OnOpenURL(
|
| params.should_replace_current_entry, params.user_gesture);
|
| }
|
|
|
| +void RenderFrameHostImpl::OnDocumentOnLoadCompleted(
|
| + int32 page_id) {
|
| + // This message is only sent for top-level frames. TODO(avi): when frame tree
|
| + // mirroring works correctly, add a check here to enforce it.
|
| + delegate_->DocumentOnLoadCompleted(this, page_id);
|
| +}
|
| +
|
| void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame(
|
| int parent_routing_id,
|
| const GURL& url) {
|
| @@ -682,11 +691,8 @@ void RenderFrameHostImpl::OnDidAccessInitialDocument() {
|
| }
|
|
|
| void RenderFrameHostImpl::OnDidDisownOpener() {
|
| - if (GetParent()) {
|
| - // This shouldn't be called for non-main-frames.
|
| - NOTREACHED();
|
| - return;
|
| - }
|
| + // This message is only sent for top-level frames. TODO(avi): when frame tree
|
| + // mirroring works correctly, add a check here to enforce it.
|
| delegate_->DidDisownOpener(this);
|
| }
|
|
|
|
|