Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Unified Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 26316005: Move out DidStartProvisionalLoad from WebContentsImpl into Navigator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes based on Charlie's latest review. Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_view_host_impl.cc
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 346f98f56b5bc8af5471c250a06287e4fcee431d..491944e87a406b7b58f00741ac12bee2b9cc6345 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -194,8 +194,11 @@ RenderViewHostImpl::RenderViewHostImpl(
main_frame_routing_id = GetProcess()->GetNextRoutingID();
main_render_frame_host_ = RenderFrameHostFactory::Create(
- this, frame_delegate, delegate_->GetFrameTree(), main_frame_routing_id,
- is_swapped_out_);
+ this, frame_delegate, delegate_->GetFrameTree(),
+ delegate_->GetFrameTree()->root(),
+ main_frame_routing_id, is_swapped_out_);
+ delegate_->GetFrameTree()->root()->set_render_frame_host(
+ main_render_frame_host_.get(), false);
GetProcess()->EnableSendQueue();
@@ -1416,8 +1419,7 @@ void RenderViewHostImpl::OnDidStartProvisionalLoadForFrame(
int64 parent_frame_id,
bool is_main_frame,
const GURL& url) {
- delegate_->DidStartProvisionalLoadForFrame(
- this, frame_id, parent_frame_id, is_main_frame, url);
+ NOTREACHED();
}
void RenderViewHostImpl::OnDidRedirectProvisionalLoad(
« no previous file with comments | « content/browser/renderer_host/render_view_host_delegate.h ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698