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

Unified Diff: content/browser/frame_host/frame_tree_node.cc

Issue 26316005: Move out DidStartProvisionalLoad from WebContentsImpl into Navigator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add NavigatorDelegate Created 7 years, 1 month 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/frame_host/frame_tree_node.cc
diff --git a/content/browser/frame_host/frame_tree_node.cc b/content/browser/frame_host/frame_tree_node.cc
index 9bed9f699ecc57edde996cde2dcb18f3c7b96ed2..df6e7f1ff8351e0a7009c7d0a7f13340b50b0e37 100644
--- a/content/browser/frame_host/frame_tree_node.cc
+++ b/content/browser/frame_host/frame_tree_node.cc
@@ -7,18 +7,25 @@
#include <queue>
#include "base/stl_util.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 {
const int64 FrameTreeNode::kInvalidFrameId = -1;
-FrameTreeNode::FrameTreeNode(int64 frame_id, const std::string& name,
- scoped_ptr<RenderFrameHostImpl> render_frame_host)
- : frame_id_(frame_id),
- frame_name_(name),
- owns_render_frame_host_(true),
- render_frame_host_(render_frame_host.release()) {
+FrameTreeNode::FrameTreeNode(
+ NavigationControllerImpl* navigation_controller,
+ NavigatorDelegate* navigator_delegate,
+ int64 frame_id,
+ const std::string& name,
+ scoped_ptr<RenderFrameHostImpl> render_frame_host)
+ : frame_id_(frame_id),
+ frame_name_(name),
+ navigator_(navigation_controller, navigator_delegate),
+ owns_render_frame_host_(true),
+ render_frame_host_(render_frame_host.release()) {
}
FrameTreeNode::~FrameTreeNode() {

Powered by Google App Engine
This is Rietveld 408576698