Move out DidStartProvisionalLoad from WebContentsImpl into Navigator.

content/browser/frame_host/frame_tree.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/frame_tree.h"
 
 #include <queue>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "content/browser/frame_host/frame_tree_node.h"
+#include "content/browser/frame_host/navigator.h"
+#include "content/browser/frame_host/navigator_delegate.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 
 namespace content {
 
 namespace {
 // Used with FrameTree::ForEach() to search for the FrameTreeNode
 // corresponding to |frame_id|.
 bool FrameTreeNodeForId(int64 frame_id, FrameTreeNode** out_node,
                         FrameTreeNode* node) {
   if (node->frame_id() == frame_id) {
     *out_node = node;
     // Terminate iteration once the node has been found.
     return false;
   }
   return true;
 }
 
 }  // namespace
 
-FrameTree::FrameTree()
-    : root_(new FrameTreeNode(FrameTreeNode::kInvalidFrameId, std::string(),
-                              scoped_ptr<RenderFrameHostImpl>())) {
+FrameTree::FrameTree() {
+}
+
+void FrameTree::Init(
+    NavigationControllerImpl* navigation_controller,

[Charlie Reis, 2013/11/07 01:22:43]

nit: Goes on previous line.

+    NavigatorDelegate* navigator_delegate) {
+  root_.reset(new FrameTreeNode(navigation_controller,
+                                navigator_delegate,
+                                FrameTreeNode::kInvalidFrameId, std::string(),
+                                scoped_ptr<RenderFrameHostImpl>()));
 }
 
 FrameTree::~FrameTree() {
 }
 
 FrameTreeNode* FrameTree::FindByID(int64 frame_id) {
   FrameTreeNode* node = NULL;
   ForEach(base::Bind(&FrameTreeNodeForId, frame_id, &node));
   return node;
 }
@@ skipping 23 matching lines @@
 }
 
 void FrameTree::AddFrame(int render_frame_host_id, int64 parent_frame_id,
                          int64 frame_id, const std::string& frame_name) {
   FrameTreeNode* parent = FindByID(parent_frame_id);
   // TODO(ajwong): Should the renderer be killed here? Would there be a race on
   // shutdown that might make this case possible?
   if (!parent)
     return;
 
-  parent->AddChild(CreateNode(frame_id, frame_name, render_frame_host_id,
+  parent->AddChild(CreateNode(parent->navigator(),
+                              frame_id, frame_name, render_frame_host_id,
                               parent->render_frame_host()->GetProcess()));
 }
 
 void FrameTree::RemoveFrame(int64 parent_frame_id, int64 frame_id) {
   // If switches::kSitePerProcess is not specified, then the FrameTree only
   // contains a node for the root element. However, even in this case
   // frame detachments need to be broadcast outwards.
   //
   // TODO(ajwong): Move this below the |parent| check after the FrameTree is
   // guaranteed to be correctly populated even without the
@@ skipping 30 matching lines @@
 RenderFrameHostImpl* FrameTree::GetMainFrame() const {
   return root_->render_frame_host();
 }
 
 void FrameTree::SetFrameRemoveListener(
     const base::Callback<void(RenderViewHostImpl*, int64)>& on_frame_removed) {
   on_frame_removed_ = on_frame_removed;
 }
 
 scoped_ptr<FrameTreeNode> FrameTree::CreateNode(
-    int64 frame_id, const std::string& frame_name, int render_frame_host_id,
+    Navigator* parent_navigator,
+    int64 frame_id,
+    const std::string& frame_name,
+    int render_frame_host_id,
     RenderProcessHost* render_process_host) {
   scoped_ptr<RenderFrameHostImpl> render_frame_host(
       new RenderFrameHostImpl(root_->render_frame_host()->render_view_host(),
-                              this, render_frame_host_id, false));
+                              this, parent_navigator, render_frame_host_id,
+                              false));
 
-  return make_scoped_ptr(new FrameTreeNode(frame_id, frame_name,
+  return make_scoped_ptr(new FrameTreeNode(parent_navigator->controller(),
+                                           parent_navigator->delegate(),
+                                           frame_id, frame_name,
                                            render_frame_host.Pass()));
 }
 
 }  // namespace content